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>,
Javier Martinez Canillas <javierm@redhat.com>,
Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de>
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 v2 RFC 07/10] drm/gem-fb-helper: Use actual bpp for size calculations
Date: Mon, 7 Mar 2022 21:52:42 +0100 [thread overview]
Message-ID: <842ab0a286ff743b625277e655d9bef505b630c1.1646683502.git.geert@linux-m68k.org> (raw)
In-Reply-To: <cover.1646683502.git.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>
---
RFC, as this code path was untested.
v2:
- Replace FIXME by TODO comment.
---
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..e5b8443378d2294b 100644
--- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c
+++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
@@ -492,6 +492,8 @@ void drm_gem_fb_end_cpu_access(struct drm_framebuffer *fb, enum dma_data_directi
}
EXPORT_SYMBOL(drm_gem_fb_end_cpu_access);
+// TODO Drop this function and replace by drm_format_info_bpp() once all
+// DRM_FORMAT_* provide proper block info in drivers/gpu/drm/drm_fourcc.c
static __u32 drm_gem_afbc_get_bpp(struct drm_device *dev,
const struct drm_mode_fb_cmd2 *mode_cmd)
{
@@ -499,11 +501,6 @@ 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 */
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-03-07 20:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 20:52 [PATCH v2 00/10] drm: Add support for low-color frame buffer formats Geert Uytterhoeven
2022-03-07 20:52 ` [PATCH v2 01/10] drm/fourcc: Add drm_format_info_bpp() helper Geert Uytterhoeven
2022-03-09 12:46 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 02/10] drm/fourcc: Add drm_format_info.is_color_indexed flag Geert Uytterhoeven
2022-03-09 12:50 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 03/10] drm/client: Use actual bpp when allocating frame buffers Geert Uytterhoeven
2022-03-09 12:51 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 04/10] drm/framebuffer: Use actual bpp for DRM_IOCTL_MODE_GETFB Geert Uytterhoeven
2022-03-09 12:53 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 05/10] drm/fourcc: Add DRM_FORMAT_C[124] Geert Uytterhoeven
2022-03-08 9:04 ` Pekka Paalanen
2022-03-09 12:57 ` Javier Martinez Canillas
2022-03-14 13:30 ` Geert Uytterhoeven
2022-03-14 15:05 ` Pekka Paalanen
2022-03-14 19:01 ` Geert Uytterhoeven
2022-03-14 22:15 ` Finn Thain
2022-03-15 7:32 ` Pekka Paalanen
2022-03-15 7:51 ` Geert Uytterhoeven
2022-03-15 7:52 ` Geert Uytterhoeven
2022-03-15 8:45 ` Pekka Paalanen
2022-03-15 8:57 ` Geert Uytterhoeven
2022-03-15 10:48 ` Pekka Paalanen
2022-03-07 20:52 ` [PATCH v2 06/10] drm/fb-helper: Add support for DRM_FORMAT_C[124] Geert Uytterhoeven
2022-03-09 13:10 ` Javier Martinez Canillas
2022-03-09 13:14 ` Geert Uytterhoeven
2022-03-07 20:52 ` Geert Uytterhoeven [this message]
2022-03-09 13:16 ` [PATCH v2 RFC 07/10] drm/gem-fb-helper: Use actual bpp for size calculations Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 RFC 08/10] drm/fourcc: Document that single-channel "red" can be any color Geert Uytterhoeven
2022-03-08 9:06 ` Pekka Paalanen
2022-03-09 13:33 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 RFC 09/10] drm/fourcc: Add DRM_FORMAT_R[124] Geert Uytterhoeven
2022-03-09 13:39 ` Javier Martinez Canillas
2022-03-07 20:52 ` [PATCH v2 RFC 10/10] drm/fourcc: Add DRM_FORMAT_D[1248] Geert Uytterhoeven
2022-03-09 13:41 ` Javier Martinez Canillas
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=842ab0a286ff743b625277e655d9bef505b630c1.1646683502.git.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=sam@ravnborg.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).