On 26/04/16 23:35, Laurent Pinchart wrote:
> The function is only used in omap_irq.c, move it there and make it
> static.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> drivers/gpu/drm/omapdrm/omap_crtc.c | 7 -------
> drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
> drivers/gpu/drm/omapdrm/omap_irq.c | 7 ++++++-
> 3 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c
> b/drivers/gpu/drm/omapdrm/omap_crtc.c
> index 3265cd990acf..e077d36016c2 100644
> --- a/drivers/gpu/drm/omapdrm/omap_crtc.c
> +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
> @@ -47,13 +47,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 omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc)
> {
> struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h
> b/drivers/gpu/drm/omapdrm/omap_drv.h
> index c8c0e207c823..29f2cc2ce555 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.h
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.h
> @@ -248,7 +248,6 @@ static inline int align_pitch(int pitch, int width, int
> bpp)
> }
>
> /* 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__ */
> diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c
> b/drivers/gpu/drm/omapdrm/omap_irq.c
> index 0b28db014569..f7c507cc104b 100644
> --- a/drivers/gpu/drm/omapdrm/omap_irq.c
> +++ b/drivers/gpu/drm/omapdrm/omap_irq.c
> @@ -108,6 +108,11 @@ int omap_irq_wait(struct drm_device *dev, struct
> omap_irq_wait *wait,
> return 0;
> }
>
> +static uint32_t pipe2vbl(struct drm_crtc *crtc)
> +{
> + return dispc_mgr_get_vsync_irq(omap_crtc_channel(crtc));
> +}
> +
> /**
> * enable_vblank - enable vblank interrupt events
> * @dev: DRM device
> @@ -223,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);
> }
You move pipe2vbl() to omap_irq.c, and then you change omap_irq to not
use pipe2vbl()?
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL:
<https://lists.freedesktop.org/archives/dri-devel/attachments/20160511/06540a45/attachment.sig>
