From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [PATCH 21/23] drm: omapdrm: Remove unused omap_framebuffer_bo function Date: Tue, 10 May 2016 14:00:51 +0300 Message-ID: <5731BF63.7060904@ti.com> References: <1461702945-14185-1-git-send-email-laurent.pinchart@ideasonboard.com> <1461702945-14185-22-git-send-email-laurent.pinchart@ideasonboard.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1705026808==" Return-path: Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by gabe.freedesktop.org (Postfix) with ESMTPS id 770796E60B for ; Tue, 10 May 2016 11:00:57 +0000 (UTC) In-Reply-To: <1461702945-14185-22-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 --===============1705026808== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cOuescuMtuWWmmFjCW9klXOdv3i70OS9m" --cOuescuMtuWWmmFjCW9klXOdv3i70OS9m Content-Type: multipart/mixed; boundary="KsqC3oT2qhdseoPw9prfQtfVbNNF2OpJ0" From: Tomi Valkeinen To: Laurent Pinchart , dri-devel@lists.freedesktop.org Cc: Rob Clark Message-ID: <5731BF63.7060904@ti.com> Subject: Re: [PATCH 21/23] drm: omapdrm: Remove unused omap_framebuffer_bo function References: <1461702945-14185-1-git-send-email-laurent.pinchart@ideasonboard.com> <1461702945-14185-22-git-send-email-laurent.pinchart@ideasonboard.com> In-Reply-To: <1461702945-14185-22-git-send-email-laurent.pinchart@ideasonboard.com> --KsqC3oT2qhdseoPw9prfQtfVbNNF2OpJ0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 26/04/16 23:35, Laurent Pinchart wrote: > The function is never used, remove it. >=20 > Signed-off-by: Laurent Pinchart > --- > drivers/gpu/drm/omapdrm/omap_drv.h | 1 - > drivers/gpu/drm/omapdrm/omap_fb.c | 10 ---------- > 2 files changed, 11 deletions(-) >=20 > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapd= rm/omap_drv.h > index e30b77c42f63..bcb9520315ab 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.h > +++ b/drivers/gpu/drm/omapdrm/omap_drv.h > @@ -168,7 +168,6 @@ struct drm_framebuffer *omap_framebuffer_create(str= uct drm_device *dev, > struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd); > struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos= ); > -struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb,= int p); > int omap_framebuffer_pin(struct drm_framebuffer *fb); > void omap_framebuffer_unpin(struct drm_framebuffer *fb); > void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, > diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdr= m/omap_fb.c > index 2edf86ab1fe1..ec2a7cd1790e 100644 > --- a/drivers/gpu/drm/omapdrm/omap_fb.c > +++ b/drivers/gpu/drm/omapdrm/omap_fb.c > @@ -316,16 +316,6 @@ void omap_framebuffer_unpin(struct drm_framebuffer= *fb) > mutex_unlock(&omap_fb->lock); > } > =20 > -struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb,= int p) > -{ > - struct omap_framebuffer *omap_fb =3D to_omap_framebuffer(fb); > - > - if (p >=3D omap_fb->format->num_planes) > - return NULL; > - > - return omap_fb->planes[p].bo; > -} > - > /* iterate thru all the connectors, returning ones that are attached > * to the same fb.. > */ >=20 I would have picked this up, but it doesn't apply without the previous patches in the series. The conflict is trivial, though. Do you want me to resolve it and apply, or do you want to keep this in your series? Tomi --KsqC3oT2qhdseoPw9prfQtfVbNNF2OpJ0-- --cOuescuMtuWWmmFjCW9klXOdv3i70OS9m 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 iQIcBAEBCAAGBQJXMb9jAAoJEPo9qoy8lh71eVEQAK7bQtkVWNqlHQEYINDGfcvN oHRGuZpOrjFEuLwMO2kb+0IGCxWFyqshvXPvcOxlbbE1Vigekh1e8FGW5J+fa4L8 LkAmouLqqkfzZxydRg5bBLwoL3/oJmjFYfTJJpNXdICcl3y9KG06AsslBuhJ6SX2 6wincterYTveVM/kaDlkj3ZDixeWYLPgeT6BcRqCkEGIKd8JFzBtLwh0bUcwGr2K xFvYd+Qv6bQm3kmyWHGDHzcZjlLuiZiLg/YhjutaHSYWFBlVZLEWq08SeykYy0dt TgoQSQNJmjWi4PgitMcvjmLsgnmzgd8TmeSZPnFk4LzoFldnmB/+Iig5DiyiDIfi NsK14C+15ns0Um1ON4YfU/P+/4RG+278m3cHs7Fl9Gy42kelLjSvf1wvdQIIHHRv jQTthXZHWwLpdWPJC5L9yRJm5eu539ZGzmzmdSqMFObDu03mjXXwaBsL4NC8HLQ0 LKi7xH2zwBUlzU+ercTtOiW26bxjH2/HeVX7B6CimesHl7PONHv3mtMQLYOZcNnf jumX7nrHPtfJMuzxuEJVAzkajrSx3qNoPSNPcjLVuDjC1j7x0UNlQg6mJmoMgkWb LvTFd9c2MAIhEgRQFDkOq18W0dn0jPZBueZ0y/eH8RUO23O066Spd4KiAS/kxp8X 2ol7mnOnhprbC1JnPtkx =WIjm -----END PGP SIGNATURE----- --cOuescuMtuWWmmFjCW9klXOdv3i70OS9m-- --===============1705026808== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1705026808==--