Support 64 bpp half float formats
Subsystems (3)
v2 cover Support 64 bpp half float formats
This series defines new formats and adds implementation to the i915 driver. Since posting v1 I have removed the pixel normalize property, as it's not needed for basic functionality. Also, I have been working on adding support to userspace.
I have submitted an RFC to Mesa to make use of the new formats:
https://patchwork.freedesktop.org/series/54759/
My igt branch is reworked to drop usage of pixel normalize and includes use of f16c intrinsics to speed up conversion:
https://gitlab.freedesktop.org/strassek/igt-gpu-tools/commits/fp16
I also have a libdrm branch with fp16 coverage added to modetest:
https://gitlab.freedesktop.org/strassek/drm/commits/fp16
To serve as a smoke test of the whole stack I have a modified version of kmscube:
https://gitlab.freedesktop.org/strassek/kmscube/commits/fp16
Kevin Strasser (2):
drm/fourcc: Add 64 bpp half float formats
drm/i915/icl: Implement half float formats
drivers/gpu/drm/drm_fourcc.c | 4 +++ drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 67 ++++++++++++++++++++++++++++++++---- include/uapi/drm/drm_fourcc.h | 11 ++++++ 4 files changed, 98 insertions(+), 6 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/2 drm/fourcc: Add 64 bpp half float formats
Add 64 bpp 16:16:16:16 half float pixel formats. Each 16 bit component is formatted in IEEE-754 half-precision float (binary16) 1:5:10 MSb-sign:exponent:fraction form.
This patch attempts to address the feedback provided when 2 of these formats were previosly proposed:
https://patchwork.kernel.org/patch/10072545/
v2:
- Fixed cpp (Ville)
- Added detail pixel formatting (Ville)
- Ordered formats in header (Ville)
--- drivers/gpu/drm/drm_fourcc.c | 4 ++++ include/uapi/drm/drm_fourcc.h | 11 +++++++++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/drm_fourcc.c +4 -0
@@ -198,6 +198,10 @@ const struct drm_format_info *__drm_format_info(u32 format) { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_RGBA8888, .depth = 32, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_BGRA8888, .depth = 32, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, + { .format = DRM_FORMAT_XRGB16161616F, .depth = 48, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1 }, + { .format = DRM_FORMAT_XBGR16161616F, .depth = 48, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1 }, + { .format = DRM_FORMAT_ARGB16161616F, .depth = 64, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, + { .format = DRM_FORMAT_ABGR16161616F, .depth = 64, .num_planes = 1, .cpp = { 8, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_RGB888_A8, .depth = 32, .num_planes = 2, .cpp = { 3, 1, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_BGR888_A8, .depth = 32, .num_planes = 2, .cpp = { 3, 1, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_XRGB8888_A8, .depth = 32, .num_planes = 2, .cpp = { 4, 1, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true },
include/uapi/drm/drm_fourcc.h +11 -0
@@ -144,6 +144,17 @@ extern "C" {#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0')/* [31:0] R:G:B:A 10:10:10:2 little endian */ #define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0')/* [31:0] B:G:R:A 10:10:10:2 little endian */ +/* +* Floating point 64bpp RGB +* IEEE 754-2008 binary16 half-precision float +* [15:0] sign:exponent:mantissa 1:5:10 +*/ +#define DRM_FORMAT_XRGB16161616F fourcc_code('X', 'R', '4', 'H')/* [63:0] x:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_XBGR16161616F fourcc_code('X', 'B', '4', 'H')/* [63:0] x:B:G:R 16:16:16:16 little endian */ + +#define DRM_FORMAT_ARGB16161616F fourcc_code('A', 'R', '4', 'H')/* [63:0] A:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_ABGR16161616F fourcc_code('A', 'B', '4', 'H')/* [63:0] A:B:G:R 16:16:16:16 little endian */ +/* packed YCbCr */ #define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ #define DRM_FORMAT_YVYU fourcc_code('Y', 'V', 'Y', 'U')/* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915/icl: Implement half float formats
In reply to Kevin Strasser64 bpp half float formats are supported on hdr planes only and are subject to the following restrictions:
* 90/270 rotation not supported
* Yf Tiling not supported
* Frame Buffer Compression not supported
* Color Keying not supported
v2:
- Drop handling pixel normalize register
- Don't use icl_is_hdr_plane too early
--- drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 67 ++++++++++++++++++++++++++++++++---- 2 files changed, 83 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +22 -0
@@ -2636,6 +2636,18 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)return DRM_FORMAT_RGB565 ;case PLANE_CTL_FORMAT_NV12 :return DRM_FORMAT_NV12 ; +case PLANE_CTL_FORMAT_XRGB_16161616F : +if (rgb_order) { +if (alpha) +return DRM_FORMAT_ABGR16161616F ; +else +return DRM_FORMAT_XBGR16161616F ; + }else { +if (alpha) +return DRM_FORMAT_ARGB16161616F ; +else +return DRM_FORMAT_XRGB16161616F ; + }default :case PLANE_CTL_FORMAT_XRGB_8888 :if (rgb_order) {
@@ -3534,6 +3546,12 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ;case DRM_FORMAT_NV12 :return PLANE_CTL_FORMAT_NV12 ; +case DRM_FORMAT_XBGR16161616F : +case DRM_FORMAT_ABGR16161616F : +return PLANE_CTL_FORMAT_XRGB_16161616F |PLANE_CTL_ORDER_RGBX ; +case DRM_FORMAT_XRGB16161616F : +case DRM_FORMAT_ARGB16161616F : +return PLANE_CTL_FORMAT_XRGB_16161616F ;default :MISSING_CASE (pixel_format); }
@@ -5027,6 +5045,10 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_NV12 : +case DRM_FORMAT_XBGR16161616F : +case DRM_FORMAT_ABGR16161616F : +case DRM_FORMAT_XRGB16161616F : +case DRM_FORMAT_ARGB16161616F :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
drivers/gpu/drm/i915/intel_sprite.c +61 -6
98 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Support 64 bpp half float formats (rev2)
In reply to Kevin Strasser== Series Details ==
== Series Details ==
Series: Support 64 bpp half float formats (rev2)
URL : https://patchwork.freedesktop.org/series/53212/
State : failure
== Summary ==
Applying: drm/fourcc: Add 64 bpp half float formats
Applying: drm/i915/icl: Implement half float formats
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_display.c
M drivers/gpu/drm/i915/intel_sprite.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c Auto-merging drivers/gpu/drm/i915/intel_display.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/i915/icl: Implement half float formats When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx