GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 04:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: omapdrm: Inline the pipe2vbl function

Browse source 
The function is only used in omap_irq.c and is just a wrapper around
dispc_mgr_get_vsync_irq(). Remove it and call the dispc function
directly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Laurent Pinchart 2015-05-27 19:15:22 +03:00
parent 156548175c
commit ca52d2f33b
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/omapdrm/omap_crtc.c
View file

@ -48,13 +48,6 @@ struct omap_crtc {
* Helper Functions * Helper Functions
*/ */
uint32_t pipe2vbl(struct drm_crtc *crtc)
{
struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
return dispc_mgr_get_vsync_irq(omap_crtc->channel);
}
struct videomode *omap_crtc_timings(struct drm_crtc *crtc) struct videomode *omap_crtc_timings(struct drm_crtc *crtc)
{ {
struct omap_crtc *omap_crtc = to_omap_crtc(crtc); struct omap_crtc *omap_crtc = to_omap_crtc(crtc);

1
drivers/gpu/drm/omapdrm/omap_drv.h
View file

@ -230,7 +230,6 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
struct dma_buf *buffer); struct dma_buf *buffer);
/* map crtc to vblank mask */ /* map crtc to vblank mask */
uint32_t pipe2vbl(struct drm_crtc *crtc);
struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder); struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder);
#endif /* __OMAP_DRV_H__ */ #endif /* __OMAP_DRV_H__ */

6
drivers/gpu/drm/omapdrm/omap_irq.c
View file

@ -130,7 +130,7 @@ int omap_irq_enable_vblank(struct drm_device *dev, unsigned int pipe)
DBG("dev=%p, crtc=%u", dev, pipe); DBG("dev=%p, crtc=%u", dev, pipe);
spin_lock_irqsave(&list_lock, flags); spin_lock_irqsave(&list_lock, flags);
priv->irq_mask |= pipe2vbl(crtc); priv->irq_mask |= dispc_mgr_get_vsync_irq(omap_crtc_channel(crtc));
omap_irq_update(dev); omap_irq_update(dev);
spin_unlock_irqrestore(&list_lock, flags); spin_unlock_irqrestore(&list_lock, flags);
@ -155,7 +155,7 @@ void omap_irq_disable_vblank(struct drm_device *dev, unsigned int pipe)
DBG("dev=%p, crtc=%u", dev, pipe); DBG("dev=%p, crtc=%u", dev, pipe);
spin_lock_irqsave(&list_lock, flags); spin_lock_irqsave(&list_lock, flags);
priv->irq_mask &= ~pipe2vbl(crtc); priv->irq_mask &= ~dispc_mgr_get_vsync_irq(omap_crtc_channel(crtc));
omap_irq_update(dev); omap_irq_update(dev);
spin_unlock_irqrestore(&list_lock, flags); spin_unlock_irqrestore(&list_lock, flags);
} }
@ -228,7 +228,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)
struct drm_crtc *crtc = priv->crtcs[id]; struct drm_crtc *crtc = priv->crtcs[id];
enum omap_channel channel = omap_crtc_channel(crtc); enum omap_channel channel = omap_crtc_channel(crtc);
if (irqstatus & pipe2vbl(crtc)) { if (irqstatus & dispc_mgr_get_vsync_irq(channel)) {
drm_handle_vblank(dev, id); drm_handle_vblank(dev, id);
omap_crtc_vblank_irq(crtc); omap_crtc_vblank_irq(crtc);
} }