From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Helge Deller <deller@gmx.de>,
Javier Martinez Canillas <javierm@redhat.com>
Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 6/8] drm/gem-fb-helper: Use actual bpp for size calculations
Date: Tue, 15 Feb 2022 17:52:24 +0100 [thread overview]
Message-ID: <20220215165226.2738568-7-geert@linux-m68k.org> (raw)
In-Reply-To: <20220215165226.2738568-1-geert@linux-m68k.org>
The AFBC helpers derive the number of bits per pixel from the deprecated
drm_format_info.cpp[] field, which does not take into account block
sizes.
Fix this by using the actual number of bits per pixel instead.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Untested.
After adding the missing block info, probably the whole function can
just be dropped, in favor of drm_format_info_bpp()?
---
drivers/gpu/drm/drm_gem_framebuffer_helper.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
index 746fd8c738451247..7eca09fce095abbe 100644
--- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c
+++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
@@ -499,11 +499,8 @@ static __u32 drm_gem_afbc_get_bpp(struct drm_device *dev,
info = drm_get_format_info(dev, mode_cmd);
- /* use whatever a driver has set */
- if (info->cpp[0])
- return info->cpp[0] * 8;
-
- /* guess otherwise */
+ // FIXME DRM_FORMAT_* should provide proper block info in
+ // FIXME drivers/gpu/drm/drm_fourcc.c
switch (info->format) {
case DRM_FORMAT_YUV420_8BIT:
return 12;
@@ -512,11 +509,8 @@ static __u32 drm_gem_afbc_get_bpp(struct drm_device *dev,
case DRM_FORMAT_VUY101010:
return 30;
default:
- break;
+ return drm_format_info_bpp(info, 0);
}
-
- /* all attempts failed */
- return 0;
}
static int drm_gem_afbc_min_size(struct drm_device *dev,
--
2.25.1
next prev parent reply other threads:[~2022-02-15 16:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 16:52 [PATCH 0/8] drm: Add support for low-color frame buffer formats Geert Uytterhoeven
2022-02-15 16:52 ` [PATCH 1/8] drm/fourcc: Add DRM_FORMAT_C[124] Geert Uytterhoeven
2022-02-17 9:46 ` Pekka Paalanen
2022-02-15 16:52 ` [PATCH 2/8] drm/fb-helper: Add support for DRM_FORMAT_C[124] Geert Uytterhoeven
2022-02-17 14:57 ` Thomas Zimmermann
2022-02-17 16:12 ` Geert Uytterhoeven
2022-02-17 16:18 ` Simon Ser
2022-02-17 17:21 ` Geert Uytterhoeven
2022-02-17 20:34 ` Sam Ravnborg
2022-02-18 8:14 ` Thomas Zimmermann
2022-02-18 8:53 ` Geert Uytterhoeven
2022-02-15 16:52 ` [PATCH 3/8] drm/fourcc: Add drm_format_info_bpp() helper Geert Uytterhoeven
2022-02-15 16:52 ` [PATCH 4/8] drm/client: Use actual bpp when allocating frame buffers Geert Uytterhoeven
2022-02-17 14:58 ` Thomas Zimmermann
2022-02-15 16:52 ` [PATCH 5/8] drm/framebuffer: Use actual bpp for DRM_IOCTL_MODE_GETFB Geert Uytterhoeven
2022-02-15 16:52 ` Geert Uytterhoeven [this message]
2022-02-15 16:52 ` [PATCH 7/8] drm/fourcc: Add DRM_FORMAT_R[124] Geert Uytterhoeven
2022-02-17 10:02 ` Pekka Paalanen
2022-02-15 16:52 ` [PATCH 8/8] drm/fourcc: Add DRM_FORMAT_D1 Geert Uytterhoeven
2022-02-17 10:10 ` Pekka Paalanen
2022-02-17 10:42 ` Geert Uytterhoeven
2022-02-17 14:28 ` Pekka Paalanen
2022-02-17 14:35 ` Michel Dänzer
2022-02-17 20:36 ` Sam Ravnborg
2022-02-17 10:11 ` Simon Ser
2022-02-17 20:37 ` [PATCH 0/8] drm: Add support for low-color frame buffer formats Sam Ravnborg
2022-02-18 8:56 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220215165226.2738568-7-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).