From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH 05/24] drm/rockchip: rockchip_drm_fb -> drm_framebuffer Date: Thu, 17 May 2018 16:46:37 +0200 Message-ID: <20180517144637.GE26515@ulmo> References: <20180330141138.28987-1-daniels@collabora.com> <20180330141138.28987-5-daniels@collabora.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1825382615==" Return-path: Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08E296E943 for ; Thu, 17 May 2018 14:46:41 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id p4-v6so5993834wrh.3 for ; Thu, 17 May 2018 07:46:40 -0700 (PDT) In-Reply-To: <20180330141138.28987-5-daniels@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Stone Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1825382615== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="/2994txjAzEdQwm5" Content-Disposition: inline --/2994txjAzEdQwm5 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 30, 2018 at 03:11:19PM +0100, Daniel Stone wrote: > Now that rockchip_drm_fb is just a wrapper around drm_framebuffer, we > can remove it. >=20 > Signed-off-by: Daniel Stone > Cc: Sandy Huang > Cc: Heiko St=C3=BCbner > --- > drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 54 ++++++++++-------------= ------ > drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 3 -- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +-- > 3 files changed, 21 insertions(+), 40 deletions(-) >=20 > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm= /rockchip/rockchip_drm_fb.c > index d7083c07c294..a4d0a00abcd9 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > @@ -25,21 +25,6 @@ > #include "rockchip_drm_gem.h" > #include "rockchip_drm_psr.h" > =20 > -#define to_rockchip_fb(x) container_of(x, struct rockchip_drm_fb, fb) > - > -struct rockchip_drm_fb { > - struct drm_framebuffer fb; > -}; > - > -struct drm_gem_object *rockchip_fb_get_gem_obj(struct drm_framebuffer *f= b, > - unsigned int plane) > -{ > - if (plane >=3D ROCKCHIP_MAX_FB_BUFFER) > - return NULL; > - > - return fb->obj[plane]; > -} > - > static int rockchip_drm_fb_dirty(struct drm_framebuffer *fb, > struct drm_file *file, > unsigned int flags, unsigned int color, > @@ -56,41 +41,40 @@ static const struct drm_framebuffer_funcs rockchip_dr= m_fb_funcs =3D { > .dirty =3D rockchip_drm_fb_dirty, > }; > =20 > -static struct rockchip_drm_fb * > +static struct drm_framebuffer * > rockchip_fb_alloc(struct drm_device *dev, const struct drm_mode_fb_cmd2 = *mode_cmd, > struct drm_gem_object **obj, unsigned int num_planes) > { > - struct rockchip_drm_fb *rockchip_fb; > + struct drm_framebuffer *fb; > int ret; > int i; > =20 > - rockchip_fb =3D kzalloc(sizeof(*rockchip_fb), GFP_KERNEL); > - if (!rockchip_fb) > + fb =3D kzalloc(sizeof(*fb), GFP_KERNEL); > + if (!fb) > return ERR_PTR(-ENOMEM); > =20 > - drm_helper_mode_fill_fb_struct(dev, &rockchip_fb->fb, mode_cmd); > + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); > =20 > for (i =3D 0; i < num_planes; i++) > - rockchip_fb->fb.obj[i] =3D obj[i]; > + fb->obj[i] =3D obj[i]; > =20 > - ret =3D drm_framebuffer_init(dev, &rockchip_fb->fb, > - &rockchip_drm_fb_funcs); > + ret =3D drm_framebuffer_init(dev, fb, &rockchip_drm_fb_funcs); > if (ret) { > DRM_DEV_ERROR(dev->dev, > "Failed to initialize framebuffer: %d\n", > ret); > - kfree(rockchip_fb); > + kfree(fb); > return ERR_PTR(ret); > } > =20 > - return rockchip_fb; > + return fb; > } > =20 > static struct drm_framebuffer * > rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_pr= iv, > const struct drm_mode_fb_cmd2 *mode_cmd) > { > - struct rockchip_drm_fb *rockchip_fb; > + struct drm_framebuffer *fb; > struct drm_gem_object *objs[ROCKCHIP_MAX_FB_BUFFER]; The use of the ROCKCHIP_MAX_FB_BUFFER seems somewhat misguided here. What if a given pixel format requires 4 planes? This function will just silently ignore the last plane. Not sure that's a good idea. Currently I don't know of any formats that require 4 planes, so this is probably not an issue, but there's also no reason to limit this to anything less than the 4 planes that's baked into the KMS ABI everywhere. Anyway, just a random comment and it doesn't have anything to do with this series, so: Reviewed-by: Thierry Reding --/2994txjAzEdQwm5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAlr9lcsACgkQ3SOs138+ s6HVChAAotMqAVZKivJHYnVl8rD/87QQS8fw0ApigxdzpoDF2WC5BoJPxP5/Du5j lC4rBWUSPnQnAk86KsFIzT5i9oKCAKLlA2bGcXpEn35itBLHK8ve3ZwVVN2UO+Ni XH+xb0mdfrDzKkNleuJi1J4G9NRhC4QN26/UdbMBjJrg3fFwJoxiC4WWdyTY7E5J wT6gaMMFsFFXrxyRky8tPN0WJFMpsAF0ktRdwd2hlgtMabCnVRqSvThWZ8s2qMlG co4RKi6pJYEplXTdLqg0Q9jmVCeAXDe9p8q7yUF+ENwXCV2QxR4FKVajiMIyyJOc ZZ/3VdtM+GhmybEoU66wcdHPAQNdzSupEw16jFLAO2iRHgS8y4jagdvmlQwezS/B rHOSfWKdEkHQPN7XR55ezz7o2ikrUfLZfQZf+iankgNrE4HMXGEyp0venF2PCvwy +HmMAzMMiQ7ik3xRUXCGV63XqHGrBSHWgtBMOu8RBXFVOgnEoUE6JxpD3acUHDbQ AG9O/4wHOoEEqXxjTibwvpY2qL9O10Psve2AIBBdi6MtFm8ztcPNpsorDQKbgD9l cRQ/dUR9BQZITtv7f/OAvKrffK85DchCJCjnT7TtcKUrE0tuWZ+lVTQ/z8PLlD4B JsKZ72CixlES7k6Mj6SjsF1FrqQHp0/gUnjOx9I2DG6HN57lFO8= =p90e -----END PGP SIGNATURE----- --/2994txjAzEdQwm5-- --===============1825382615== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1825382615==--