Commit ca52d2f3 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: omapdrm: Inline the pipe2vbl function 



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 15654817

drivers/gpu/drm/omapdrm/omap_crtc.c

+0 −7
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ struct omap_crtc { 
 * 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 omap_crtc *omap_crtc = to_omap_crtc(crtc);

drivers/gpu/drm/omapdrm/omap_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, 
		struct dma_buf *buffer);



/* map crtc to vblank mask */

uint32_t pipe2vbl(struct drm_crtc *crtc);

struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder);



#endif /* __OMAP_DRV_H__ */

drivers/gpu/drm/omapdrm/omap_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int omap_irq_enable_vblank(struct drm_device *dev, unsigned int pipe) 
	DBG("dev=%p, crtc=%u", dev, pipe);



	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);

	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);



	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);

	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];

		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);

			omap_crtc_vblank_irq(crtc);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE