drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers
Subsystems (2)
PATCH v2 1/1 drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers
Framebuffer formats P01x are supported by GLK, but the function which handles CSC on plane color control register, still expectes the input buffer to be REC709. This can cause inaccurate output for direct P01x flips.
This patch checks if the color_encoding property is set to YCBCR_2020, and enables the corresponding color conversion mode on plane CSC.
PS: renamed variable plane_color_ctl to color_ctl for 80 char stuff.
V2: Expose the YCBCR_BT2020 value in enum values of supported encoding
formats.
--- drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++++++---------- drivers/gpu/drm/i915/intel_sprite.c | 10 ++++++++-- 2 files changed, 24 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +16 -10
@@ -3868,24 +3868,30 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,to_i915 (plane_state->base.plane->dev);const struct drm_framebuffer *fb = plane_state->base.fb;struct intel_plane *plane =to_intel_plane (plane_state->base.plane); -u32 plane_color_ctl =0 ; +u32 color_ctl =0 ; - plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; - plane_color_ctl |=glk_plane_color_ctl_alpha (plane_state); + color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; + color_ctl |=glk_plane_color_ctl_alpha (plane_state);if (fb->format->is_yuv && !icl_is_hdr_plane (dev_priv, plane->id)) { -if (plane_state->base.color_encoding ==DRM_COLOR_YCBCR_BT709 ) - plane_color_ctl |=PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709 ; -else - plane_color_ctl |=PLANE_COLOR_CSC_MODE_YUV601_TO_RGB709 ; +switch (plane_state->base.color_encoding) { +case DRM_COLOR_YCBCR_BT709 : + color_ctl |=PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709 ; +break ; +case DRM_COLOR_YCBCR_BT2020 : + color_ctl |=PLANE_COLOR_CSC_MODE_YUV2020_TO_RGB2020 ; +break ; +default : + color_ctl |=PLANE_COLOR_CSC_MODE_YUV601_TO_RGB709 ; + }if (plane_state->base.color_range ==DRM_COLOR_YCBCR_FULL_RANGE ) - plane_color_ctl |=PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE ; + color_ctl |=PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE ; }else if (fb->format->is_yuv) { - plane_color_ctl |=PLANE_COLOR_INPUT_CSC_ENABLE ; + color_ctl |=PLANE_COLOR_INPUT_CSC_ENABLE ; } -return plane_color_ctl; +return color_ctl; } static int
drivers/gpu/drm/i915/intel_sprite.c +8 -2
@@ -2238,6 +2238,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,struct intel_plane *plane;enum drm_plane_type plane_type;unsigned int supported_rotations; +unsigned int supported_encodings;unsigned int possible_crtcs;const u64 *modifiers;const u32 *formats;
@@ -2325,9 +2326,14 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,DRM_MODE_ROTATE_0 , supported_rotations); + supported_encodings =BIT (DRM_COLOR_YCBCR_BT601 ) | +BIT (DRM_COLOR_YCBCR_BT709 ); + +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) + supported_encodings |=DRM_COLOR_YCBCR_BT2020 ; + drm_plane_create_color_properties(&plane->base, - BIT(DRM_COLOR_YCBCR_BT601) | - BIT(DRM_COLOR_YCBCR_BT709), + supported_encodings, BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) | BIT(DRM_COLOR_YCBCR_FULL_RANGE), DRM_COLOR_YCBCR_BT709,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers (rev2)
URL : https://patchwork.freedesktop.org/series/60195/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6029 -> Patchwork_12948
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/60195/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12948 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@basic-default:
- fi-icl-y: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#108569] / [fdo#110581])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/fi-icl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/fi-icl-y/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: [INCOMPLETE][3] ([fdo#108602] / [fdo#108744] / [fdo#110581]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#110581]: https://bugs.freedesktop.org/show_bug.cgi?id=110581
Participating hosts (54 -> 44)
------------------------------
Missing (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-kbl-guc fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6029 -> Patchwork_12948
CI_DRM_6029: 0548213ff6d52d4638778a95a4b3a7900e683ac3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4972: f052e49a43cc9704ea5f240df15dd9d3dfed68ab @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12948: 4ee3f21b0b1aa6dd3df3a96714d51dcaff4a94bd @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4ee3f21b0b1a drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers (rev2)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: drm/i915/GLK: Properly handle plane CSC for BT2020 framebuffers (rev2)
URL : https://patchwork.freedesktop.org/series/60195/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6029_full -> Patchwork_12948_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12948_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@dpms-lpsp:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#107807] / [fdo#110581])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-skl2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-skl9/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-apl2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-apl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [PASS][5] -> [FAIL][6] ([fdo#103167]) +5 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb2/igt@[email protected]
* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-glk: [PASS][7] -> [SKIP][8] ([fdo#109271]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-glk9/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-glk1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-skl10/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-skl3/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103166])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb8/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb8/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-kbl: [PASS][15] -> [FAIL][16] ([fdo#99912])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-kbl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-kbl6/igt@[email protected]
#### Possible fixes ####
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][17] ([fdo#108566]) -> [PASS][18] +9 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-apl8/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-apl5/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions:
- shard-hsw: [FAIL][19] ([fdo#103355]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-hsw6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-hsw7/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled:
- shard-skl: [FAIL][21] ([fdo#103184] / [fdo#103232]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-skl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-skl8/igt@[email protected]
* igt@kms_flip@2x-flip-vs-suspend-interruptible:
- shard-glk: [INCOMPLETE][23] ([fdo#103359] / [fdo#110581] / [k.org#198133]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-glk4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-glk2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu:
- shard-skl: [FAIL][25] ([fdo#103167] / [fdo#110379]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-skl4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-skl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: [FAIL][27] ([fdo#103167]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
* igt@kms_plane@pixel-format-pipe-b-planes:
- shard-glk: [SKIP][29] ([fdo#109271]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-glk1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-glk9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][31] ([fdo#108145] / [fdo#110403]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-skl3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-skl2/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][33] ([fdo#103166]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb3/igt@[email protected]
* igt@kms_plane_scaling@pipe-c-scaler-with-rotation:
- shard-glk: [SKIP][35] ([fdo#109271] / [fdo#109278]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-glk7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-glk9/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb6/igt@kms_psr@psr2_no_drrs.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-iclb: [FAIL][39] ([fdo#99912]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6029/shard-iclb2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/shard-iclb5/igt@[email protected]
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110379]: https://bugs.freedesktop.org/show_bug.cgi?id=110379
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110581]: https://bugs.freedesktop.org/show_bug.cgi?id=110581
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6029 -> Patchwork_12948
CI_DRM_6029: 0548213ff6d52d4638778a95a4b3a7900e683ac3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4972: f052e49a43cc9704ea5f240df15dd9d3dfed68ab @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12948: 4ee3f21b0b1aa6dd3df3a96714d51dcaff4a94bd @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12948/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx