From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [PATCH 17/23] drm: omapdrm: Make pipe2vbl function static Date: Wed, 11 May 2016 14:01:26 +0300 Message-ID: <57331106.6000908@ti.com> References: <1461702945-14185-1-git-send-email-laurent.pinchart@ideasonboard.com> <1461702945-14185-18-git-send-email-laurent.pinchart@ideasonboard.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1329611253==" Return-path: Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [198.47.19.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21BA16E525 for ; Wed, 11 May 2016 11:06:59 +0000 (UTC) In-Reply-To: <1461702945-14185-18-git-send-email-laurent.pinchart@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Laurent Pinchart , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1329611253== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4Ode9734qc6erMEflHQki2wPRxH8c1pOH" --4Ode9734qc6erMEflHQki2wPRxH8c1pOH Content-Type: multipart/mixed; boundary="d6tKrqQP1tEEbgTaRfCP8F8nm5e7KfuND" From: Tomi Valkeinen To: Laurent Pinchart , dri-devel@lists.freedesktop.org Cc: Rob Clark Message-ID: <57331106.6000908@ti.com> Subject: Re: [PATCH 17/23] drm: omapdrm: Make pipe2vbl function static References: <1461702945-14185-1-git-send-email-laurent.pinchart@ideasonboard.com> <1461702945-14185-18-git-send-email-laurent.pinchart@ideasonboard.com> In-Reply-To: <1461702945-14185-18-git-send-email-laurent.pinchart@ideasonboard.com> --d6tKrqQP1tEEbgTaRfCP8F8nm5e7KfuND Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Laurent Pinchart > --- > 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(-) >=20 > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omap= drm/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 > */ > =20 > -uint32_t pipe2vbl(struct drm_crtc *crtc) > -{ > - struct omap_crtc *omap_crtc =3D 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 =3D to_omap_crtc(crtc); > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapd= rm/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) > } > =20 > /* map crtc to vblank mask */ > -uint32_t pipe2vbl(struct drm_crtc *crtc); > struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *en= coder); > =20 > #endif /* __OMAP_DRV_H__ */ > diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapd= rm/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 o= map_irq_wait *wait, > return 0; > } > =20 > +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 =3D priv->crtcs[id]; > enum omap_channel channel =3D omap_crtc_channel(crtc); > =20 > - 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 --d6tKrqQP1tEEbgTaRfCP8F8nm5e7KfuND-- --4Ode9734qc6erMEflHQki2wPRxH8c1pOH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXMxEOAAoJEPo9qoy8lh71LLgP/Ras7Yqs5771MMZhUTMN2+ge Cw4Fn+ZhX6Hvb2Gr/eK4YVaH8Jc0fqj7ShHJ8sNsH7PFv6qC7d80IEvEk4+vgmpA S9AMA6S/Eena9hgCwYS6ZJH7WfoAbU5ZTB4+q3dcCjrkk7gpwF9tz5mj6xXcnFqp dBA86G+mDiGeiBESUqiCB/EdZLck9Ndr4x23KlS6H00NWN5UiKrqKouNEtqNxgXF gHQp0siGBvZeUQvp580f/3RHkEX/p+CoWQEdFljlXMQmWuTc4IXOuUyaAFMS7RIG 7Ak49R7mpKDxhOAdMR9fj0JpbzKBOgHFgs11Z8fhtPBZ2JHW8uB8c30e8Pjp9aFF puMm9kffj6fwHo/Egoocjb1LqDluY78ztY7gnKQLKi671uxVQSo4i9GcSTJ9Z27l xhQnYp4a395GgbGuXVM/N0Z8oGJjBOI5nBfbX6l/s1aqG4fVzGHhEuMf8mNFU/8f FIsBTptw5FnI5a7PrD2mtX50R9WP/cSUIl/zKePa637D1IFrPU8EsQIHnzB/P4CR HJpCUh1VqUNwdjdqYyHerbFYx+rQQLTl/kLl8G2xkXESTsSEWfOrvr2cBMoIf22O 7KIdo0/L0cLikPQVwHwenrG3MbK7QY0YHj4xuwuuTHojZ9HZg9kN3xYeyqDdKGMS Wl27zKGnAFHFZCEIJuqN =7zQ/ -----END PGP SIGNATURE----- --4Ode9734qc6erMEflHQki2wPRxH8c1pOH-- --===============1329611253== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1329611253==--