From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [PATCH v3 18/20] drm: omapdrm: Make pipe2vbl function static Date: Mon, 12 Dec 2016 12:41:11 +0200 Message-ID: <92204dfe-84ea-14ee-3178-577ed2a5c23c@ti.com> References: <1474288063-5315-1-git-send-email-laurent.pinchart@ideasonboard.com> <1474288063-5315-19-git-send-email-laurent.pinchart@ideasonboard.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0611529003==" Return-path: Received: from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 417B86E2B9 for ; Mon, 12 Dec 2016 10:41:17 +0000 (UTC) In-Reply-To: <1474288063-5315-19-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 --===============0611529003== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bp1aotMw2sbhOBg0X75HKn8CQdsLVtpH8" --bp1aotMw2sbhOBg0X75HKn8CQdsLVtpH8 Content-Type: multipart/mixed; boundary="Xe6Lpj6hSBuPxjkjDGQLkRw1lbt6m7WaH"; protected-headers="v1" From: Tomi Valkeinen To: Laurent Pinchart , dri-devel@lists.freedesktop.org Message-ID: <92204dfe-84ea-14ee-3178-577ed2a5c23c@ti.com> Subject: Re: [PATCH v3 18/20] drm: omapdrm: Make pipe2vbl function static References: <1474288063-5315-1-git-send-email-laurent.pinchart@ideasonboard.com> <1474288063-5315-19-git-send-email-laurent.pinchart@ideasonboard.com> In-Reply-To: <1474288063-5315-19-git-send-email-laurent.pinchart@ideasonboard.com> --Xe6Lpj6hSBuPxjkjDGQLkRw1lbt6m7WaH Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 19/09/16 15:27, 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 6983a889d811..fb01357721fe 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -48,13 +48,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 8aa8e45098a2..4fee7b94eefb 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.h > +++ b/drivers/gpu/drm/omapdrm/omap_drv.h > @@ -234,7 +234,6 @@ struct drm_gem_object *omap_gem_prime_import(struct= drm_device *dev, > struct dma_buf *buffer); > =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 27225492c81b..28ff7b73a853 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 > @@ -228,7 +233,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); > } >=20 Did you look at the code you have above =3D). I think the bottom change is a good one. Just remove pipe2vbl(). Tomi --Xe6Lpj6hSBuPxjkjDGQLkRw1lbt6m7WaH-- --bp1aotMw2sbhOBg0X75HKn8CQdsLVtpH8 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 iQIcBAEBCAAGBQJYTn7HAAoJEPo9qoy8lh71KGUP/0RJaMlax+R+Oqamw3bo6gv8 ElDwEKEJolhEOtf6dc9PVkm6KDM6nTgOGrJIkYg9Pn6RYieAR7eW/zSy8rnKZTYR tZZBuGVVgtr95eM8obEqubZNv0N0H+bTJF7aHsS7BrwOsMvi5piB9JSRbhIXjZ+f OzMEv4oDYyl4mpWcCUHltfgcY0qwhNWtE/d3pHqSZB+5uSKLUAeqj/9YkWhGNPks kBWxQwyWmNhVwc9+a6Y4MCx3JofpsfQnXXB5YULryfQFYDVN9e+vgs8VWVpzFIcY y+bteW5SzKi6tPBBWPUfvFs/VQh8PKzeqy/baeyxpd8NEZuEah4E0L9nV2/o8zuU vL6rK71vs+wf5u0V8vUXY6BqSARvHeMTiTyXTXYAdeYgg2JOk9eWKvuv/1Cn4WfX IDZTmLx6Evuyr2ZAwIkYNcnj4B/EcxtqPOR6A1/7rBUO65Z+sel2J711XMR/beMa dB7hm8xo/RZX7K5e+5E4o6srMK1yfdq7FT3Dv1GyEEESYaMxiVOisWI7UpmvpbRS Rqt2M++Cin/hVb1xaMtWHrXv4MHwN1qJQy2sljqy4b+SjYxBNICOLBAL7klbrNwh EwmrgRoJuhikg+Z4yzf0gDL4BwSgZczsbyL9GSIxmW0AONpnFRghG1YsHwPobF4W q8KnnJx1o3k5Xl5oTafn =dW43 -----END PGP SIGNATURE----- --bp1aotMw2sbhOBg0X75HKn8CQdsLVtpH8-- --===============0611529003== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============0611529003==--