* [PATCH 0/3] Extend BT2020 support in iCSC and fixes
@ 2019-05-09 19:11 Uma Shankar
2019-05-09 19:11 ` [PATCH 1/3] drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case Uma Shankar
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Uma Shankar @ 2019-05-09 19:11 UTC (permalink / raw)
To: intel-gfx
This series adds support for BT2020 YCbCr to RGB conversion
using input CSC. This also fixes issues with BT601 and BT709
coefficients.
Uma Shankar (3):
drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case
drm/i915/icl: Fix Y pre-offset for Full Range YCbCr
drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
drivers/gpu/drm/i915/intel_sprite.c | 55 +++++++++++++++++++++++++++----------
1 file changed, 41 insertions(+), 14 deletions(-)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
@ 2019-05-09 19:11 ` Uma Shankar
2019-05-09 19:11 ` [PATCH 2/3] drm/i915/icl: Fix Y pre-offset for Full Range YCbCr Uma Shankar
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Uma Shankar @ 2019-05-09 19:11 UTC (permalink / raw)
To: intel-gfx
Currently input csc for YCbCR to RGB conversion handles only
BT601 and Bt709. Extending it to support BT2020 as well.
v2: Fixed the co-efficients for LR to FR conversion,
as suggested by Ville.
v3: Fixed Y Pre-offset in case of Full Range YCbCr as suggested
by Ville.
v4: Split the v2 and v3 changes.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 2913e89..4f513600 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -433,6 +433,18 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
0x9EF8, 0x7800, 0xABF8,
0x0, 0x7800, 0x7ED8,
},
+ /*
+ * BT.2020 full range YCbCr -> full range RGB
+ * The matrix required is :
+ * [1.000, 0.000, 1.474,
+ * 1.000, -0.1645, -0.5713,
+ * 1.000, 1.8814, 0.0000]
+ */
+ [DRM_COLOR_YCBCR_BT2020] = {
+ 0x7BC8, 0x7800, 0x0,
+ 0x8928, 0x7800, 0xAA88,
+ 0x0, 0x7800, 0x7F10,
+ },
};
/* Matrix for Limited Range to Full Range Conversion */
@@ -461,6 +473,18 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
0x8888, 0x7918, 0xADA8,
0x0, 0x7918, 0x6870,
},
+ /*
+ * BT.2020 Limited range YCbCr -> full range RGB
+ * The matrix required is :
+ * [1.164, 0.000, 1.678,
+ * 1.164, -0.1873, -0.6504,
+ * 1.164, 2.1417, 0.0000]
+ */
+ [DRM_COLOR_YCBCR_BT2020] = {
+ 0x7D70, 0x7950, 0x0,
+ 0x8A68, 0x7950, 0xAC00,
+ 0x0, 0x7950, 0x6890,
+ },
};
const u16 *csc;
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] drm/i915/icl: Fix Y pre-offset for Full Range YCbCr
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
2019-05-09 19:11 ` [PATCH 1/3] drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case Uma Shankar
@ 2019-05-09 19:11 ` Uma Shankar
2019-05-09 19:11 ` [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709 Uma Shankar
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Uma Shankar @ 2019-05-09 19:11 UTC (permalink / raw)
To: intel-gfx
Fixed Y Pre-offset in case of Full Range YCbCr.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 4f513600..c9c970f 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -505,8 +505,11 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
I915_WRITE_FW(PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 0),
PREOFF_YUV_TO_RGB_HI);
- I915_WRITE_FW(PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
- PREOFF_YUV_TO_RGB_ME);
+ if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
+ I915_WRITE_FW(PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1), 0);
+ else
+ I915_WRITE_FW(PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
+ PREOFF_YUV_TO_RGB_ME);
I915_WRITE_FW(PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 2),
PREOFF_YUV_TO_RGB_LO);
I915_WRITE_FW(PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 0), 0x0);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
2019-05-09 19:11 ` [PATCH 1/3] drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case Uma Shankar
2019-05-09 19:11 ` [PATCH 2/3] drm/i915/icl: Fix Y pre-offset for Full Range YCbCr Uma Shankar
@ 2019-05-09 19:11 ` Uma Shankar
2019-05-09 19:24 ` Ville Syrjälä
2019-05-09 19:37 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes Patchwork
` (2 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Uma Shankar @ 2019-05-09 19:11 UTC (permalink / raw)
To: intel-gfx
Input CSC Co-efficients for BT601 and BT709 YCbCR to RGB
conversion were slightly off. Fixed the same.
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index c9c970f..1239457 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -430,7 +430,7 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
*/
[DRM_COLOR_YCBCR_BT709] = {
0x7C98, 0x7800, 0x0,
- 0x9EF8, 0x7800, 0xABF8,
+ 0x9EF8, 0x7800, 0xAC00,
0x0, 0x7800, 0x7ED8,
},
/*
@@ -453,25 +453,25 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
* BT.601 Limted range YCbCr -> full range RGB
* The matrix required is :
* [1.164384, 0.000, 1.596370,
- * 1.138393, -0.382500, -0.794598,
- * 1.138393, 1.971696, 0.0000]
+ * 1.164384, -0.382500, -0.794598,
+ * 1.164384, 1.971696, 0.0000]
*/
[DRM_COLOR_YCBCR_BT601] = {
- 0x7CC8, 0x7950, 0x0,
- 0x8CB8, 0x7918, 0x9C40,
- 0x0, 0x7918, 0x7FC8,
+ 0x7C80, 0x7950, 0x0,
+ 0x8CB8, 0x7950, 0x9C40,
+ 0x0, 0x7950, 0x7FC8,
},
/*
* BT.709 Limited range YCbCr -> full range RGB
* The matrix required is :
- * [1.164, 0.000, 1.833671,
- * 1.138393, -0.213249, -0.532909,
- * 1.138393, 2.112402, 0.0000]
+ * [1.164384, 0.000, 1.792741,
+ * 1.164384, -0.213249, -0.532909,
+ * 1.164384, 2.112402, 0.0000]
*/
[DRM_COLOR_YCBCR_BT709] = {
- 0x7EA8, 0x7950, 0x0,
- 0x8888, 0x7918, 0xADA8,
- 0x0, 0x7918, 0x6870,
+ 0x7E58, 0x7950, 0x0,
+ 0x8888, 0x7950, 0xADA8,
+ 0x0, 0x7950, 0x6870,
},
/*
* BT.2020 Limited range YCbCr -> full range RGB
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
2019-05-09 19:11 ` [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709 Uma Shankar
@ 2019-05-09 19:24 ` Ville Syrjälä
2019-05-09 19:37 ` Shankar, Uma
2019-05-09 20:18 ` [v2] " Uma Shankar
0 siblings, 2 replies; 10+ messages in thread
From: Ville Syrjälä @ 2019-05-09 19:24 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
On Fri, May 10, 2019 at 12:41:48AM +0530, Uma Shankar wrote:
> Input CSC Co-efficients for BT601 and BT709 YCbCR to RGB
> conversion were slightly off. Fixed the same.
>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> ---
> drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index c9c970f..1239457 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -430,7 +430,7 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
> */
> [DRM_COLOR_YCBCR_BT709] = {
> 0x7C98, 0x7800, 0x0,
> - 0x9EF8, 0x7800, 0xABF8,
> + 0x9EF8, 0x7800, 0xAC00,
> 0x0, 0x7800, 0x7ED8,
> },
> /*
> @@ -453,25 +453,25 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
> * BT.601 Limted range YCbCr -> full range RGB
> * The matrix required is :
> * [1.164384, 0.000, 1.596370,
> - * 1.138393, -0.382500, -0.794598,
> - * 1.138393, 1.971696, 0.0000]
> + * 1.164384, -0.382500, -0.794598,
> + * 1.164384, 1.971696, 0.0000]
Still not quite what I'm getting here:
1.164384 0.000000 1.596027
1.164384 -0.391762 -0.812968
1.164384 2.017232 0.000000
> */
> [DRM_COLOR_YCBCR_BT601] = {
> - 0x7CC8, 0x7950, 0x0,
> - 0x8CB8, 0x7918, 0x9C40,
> - 0x0, 0x7918, 0x7FC8,
> + 0x7C80, 0x7950, 0x0,
> + 0x8CB8, 0x7950, 0x9C40,
> + 0x0, 0x7950, 0x7FC8,
> },
> /*
> * BT.709 Limited range YCbCr -> full range RGB
> * The matrix required is :
> - * [1.164, 0.000, 1.833671,
> - * 1.138393, -0.213249, -0.532909,
> - * 1.138393, 2.112402, 0.0000]
> + * [1.164384, 0.000, 1.792741,
> + * 1.164384, -0.213249, -0.532909,
> + * 1.164384, 2.112402, 0.0000]
> */
This one matches what I'm getting.
> [DRM_COLOR_YCBCR_BT709] = {
> - 0x7EA8, 0x7950, 0x0,
> - 0x8888, 0x7918, 0xADA8,
> - 0x0, 0x7918, 0x6870,
> + 0x7E58, 0x7950, 0x0,
> + 0x8888, 0x7950, 0xADA8,
> + 0x0, 0x7950, 0x6870,
> },
> /*
> * BT.2020 Limited range YCbCr -> full range RGB
> --
> 1.9.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
` (2 preceding siblings ...)
2019-05-09 19:11 ` [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709 Uma Shankar
@ 2019-05-09 19:37 ` Patchwork
2019-05-09 20:38 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes (rev2) Patchwork
2019-05-10 5:39 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-05-09 19:37 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Extend BT2020 support in iCSC and fixes
URL : https://patchwork.freedesktop.org/series/60480/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6072 -> Patchwork_12996
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/
Known issues
------------
Here are the changes found in Patchwork_12996 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_cpu_reloc@basic:
- fi-icl-u3: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#110246])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-icl-u3/igt@gem_cpu_reloc@basic.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/fi-icl-u3/igt@gem_cpu_reloc@basic.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-7500u: [DMESG-WARN][3] ([fdo#105128] / [fdo#107139]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
#### Warnings ####
* igt@i915_selftest@live_hangcheck:
- fi-apl-guc: [INCOMPLETE][5] ([fdo#103927] / [fdo#110624]) -> [DMESG-FAIL][6] ([fdo#110620])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
* igt@runner@aborted:
- fi-apl-guc: [FAIL][7] ([fdo#110624]) -> [FAIL][8] ([fdo#110622])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-apl-guc/igt@runner@aborted.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/fi-apl-guc/igt@runner@aborted.html
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105128]: https://bugs.freedesktop.org/show_bug.cgi?id=105128
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
[fdo#110620]: https://bugs.freedesktop.org/show_bug.cgi?id=110620
[fdo#110622]: https://bugs.freedesktop.org/show_bug.cgi?id=110622
[fdo#110624]: https://bugs.freedesktop.org/show_bug.cgi?id=110624
Participating hosts (49 -> 43)
------------------------------
Additional (1): fi-blb-e6850
Missing (7): fi-ilk-m540 fi-bdw-5557u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_6072 -> Patchwork_12996
CI_DRM_6072: 645586708589c3d2ac81114595e875cdfbbff385 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4976: b1d91d0228db999145405e529952ca49bab7f706 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12996: cdd5ea3566e2ed1bc6fa7e7e9aaf03a846ea1210 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cdd5ea3566e2 drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
a6e420d39645 drm/i915/icl: Fix Y pre-offset for Full Range YCbCr
5b4fbc4e2925 drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12996/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
2019-05-09 19:24 ` Ville Syrjälä
@ 2019-05-09 19:37 ` Shankar, Uma
2019-05-09 20:18 ` [v2] " Uma Shankar
1 sibling, 0 replies; 10+ messages in thread
From: Shankar, Uma @ 2019-05-09 19:37 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx@lists.freedesktop.org
>-----Original Message-----
>From: Ville Syrjälä [mailto:ville.syrjala@linux.intel.com]
>Sent: Friday, May 10, 2019 12:54 AM
>To: Shankar, Uma <uma.shankar@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; maarten.lankhorst@linux.intel.com; Sharma,
>Shashank <shashank.sharma@intel.com>
>Subject: Re: [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
>
>On Fri, May 10, 2019 at 12:41:48AM +0530, Uma Shankar wrote:
>> Input CSC Co-efficients for BT601 and BT709 YCbCR to RGB conversion
>> were slightly off. Fixed the same.
>>
>> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++------------
>> 1 file changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c
>> b/drivers/gpu/drm/i915/intel_sprite.c
>> index c9c970f..1239457 100644
>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>> @@ -430,7 +430,7 @@ int intel_plane_check_src_coordinates(struct
>intel_plane_state *plane_state)
>> */
>> [DRM_COLOR_YCBCR_BT709] = {
>> 0x7C98, 0x7800, 0x0,
>> - 0x9EF8, 0x7800, 0xABF8,
>> + 0x9EF8, 0x7800, 0xAC00,
>> 0x0, 0x7800, 0x7ED8,
>> },
>> /*
>> @@ -453,25 +453,25 @@ int intel_plane_check_src_coordinates(struct
>intel_plane_state *plane_state)
>> * BT.601 Limted range YCbCr -> full range RGB
>> * The matrix required is :
>> * [1.164384, 0.000, 1.596370,
>> - * 1.138393, -0.382500, -0.794598,
>> - * 1.138393, 1.971696, 0.0000]
>> + * 1.164384, -0.382500, -0.794598,
>> + * 1.164384, 1.971696, 0.0000]
>
>Still not quite what I'm getting here:
>1.164384 0.000000 1.596027
>1.164384 -0.391762 -0.812968
>1.164384 2.017232 0.000000
Hmm yeah, the reference matrix I used earlier is not accurate it seems. With
igt_color_encoding I am getting what you get here. Will update and resend.
>> */
>> [DRM_COLOR_YCBCR_BT601] = {
>> - 0x7CC8, 0x7950, 0x0,
>> - 0x8CB8, 0x7918, 0x9C40,
>> - 0x0, 0x7918, 0x7FC8,
>> + 0x7C80, 0x7950, 0x0,
>> + 0x8CB8, 0x7950, 0x9C40,
>> + 0x0, 0x7950, 0x7FC8,
>> },
>> /*
>> * BT.709 Limited range YCbCr -> full range RGB
>> * The matrix required is :
>> - * [1.164, 0.000, 1.833671,
>> - * 1.138393, -0.213249, -0.532909,
>> - * 1.138393, 2.112402, 0.0000]
>> + * [1.164384, 0.000, 1.792741,
>> + * 1.164384, -0.213249, -0.532909,
>> + * 1.164384, 2.112402, 0.0000]
>> */
>
>This one matches what I'm getting.
>
>> [DRM_COLOR_YCBCR_BT709] = {
>> - 0x7EA8, 0x7950, 0x0,
>> - 0x8888, 0x7918, 0xADA8,
>> - 0x0, 0x7918, 0x6870,
>> + 0x7E58, 0x7950, 0x0,
>> + 0x8888, 0x7950, 0xADA8,
>> + 0x0, 0x7950, 0x6870,
>> },
>> /*
>> * BT.2020 Limited range YCbCr -> full range RGB
>> --
>> 1.9.1
>
>--
>Ville Syrjälä
>Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [v2] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
2019-05-09 19:24 ` Ville Syrjälä
2019-05-09 19:37 ` Shankar, Uma
@ 2019-05-09 20:18 ` Uma Shankar
1 sibling, 0 replies; 10+ messages in thread
From: Uma Shankar @ 2019-05-09 20:18 UTC (permalink / raw)
To: intel-gfx; +Cc: ville.syrjala, maarten.lankhorst
Input CSC Co-efficients for BT601 and BT709 YCbCR to RGB
conversion were slightly off. Fixed the same.
v2: Fixed the co-eficients as there was issue with reference
matrix, spotted by Ville.
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index c9c970f..ca15799 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -430,7 +430,7 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
*/
[DRM_COLOR_YCBCR_BT709] = {
0x7C98, 0x7800, 0x0,
- 0x9EF8, 0x7800, 0xABF8,
+ 0x9EF8, 0x7800, 0xAC00,
0x0, 0x7800, 0x7ED8,
},
/*
@@ -452,26 +452,26 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
/*
* BT.601 Limted range YCbCr -> full range RGB
* The matrix required is :
- * [1.164384, 0.000, 1.596370,
- * 1.138393, -0.382500, -0.794598,
- * 1.138393, 1.971696, 0.0000]
+ * [1.164384, 0.000, 1.596027,
+ * 1.164384, -0.39175, -0.812813,
+ * 1.164384, 2.017232, 0.0000]
*/
[DRM_COLOR_YCBCR_BT601] = {
0x7CC8, 0x7950, 0x0,
- 0x8CB8, 0x7918, 0x9C40,
- 0x0, 0x7918, 0x7FC8,
+ 0x8D00, 0x7950, 0x9C88,
+ 0x0, 0x7950, 0x6810,
},
/*
* BT.709 Limited range YCbCr -> full range RGB
* The matrix required is :
- * [1.164, 0.000, 1.833671,
- * 1.138393, -0.213249, -0.532909,
- * 1.138393, 2.112402, 0.0000]
+ * [1.164384, 0.000, 1.792741,
+ * 1.164384, -0.213249, -0.532909,
+ * 1.164384, 2.112402, 0.0000]
*/
[DRM_COLOR_YCBCR_BT709] = {
- 0x7EA8, 0x7950, 0x0,
- 0x8888, 0x7918, 0xADA8,
- 0x0, 0x7918, 0x6870,
+ 0x7E58, 0x7950, 0x0,
+ 0x8888, 0x7950, 0xADA8,
+ 0x0, 0x7950, 0x6870,
},
/*
* BT.2020 Limited range YCbCr -> full range RGB
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes (rev2)
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
` (3 preceding siblings ...)
2019-05-09 19:37 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes Patchwork
@ 2019-05-09 20:38 ` Patchwork
2019-05-10 5:39 ` ✓ Fi.CI.IGT: " Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-05-09 20:38 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Extend BT2020 support in iCSC and fixes (rev2)
URL : https://patchwork.freedesktop.org/series/60480/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6072 -> Patchwork_12997
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/
Known issues
------------
Here are the changes found in Patchwork_12997 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: [PASS][1] -> [DMESG-FAIL][2] ([fdo#110235])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: [PASS][3] -> [INCOMPLETE][4] ([fdo#108602] / [fdo#108744])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-7500u: [DMESG-WARN][5] ([fdo#105128] / [fdo#107139]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
[fdo#105128]: https://bugs.freedesktop.org/show_bug.cgi?id=105128
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
Participating hosts (49 -> 43)
------------------------------
Additional (1): fi-blb-e6850
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-apl-guc fi-ctg-p8600 fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_6072 -> Patchwork_12997
CI_DRM_6072: 645586708589c3d2ac81114595e875cdfbbff385 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4976: b1d91d0228db999145405e529952ca49bab7f706 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12997: 52ef243e7805e0894631ede9c11484611c035879 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
52ef243e7805 drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709
e16ab39821c8 drm/i915/icl: Fix Y pre-offset for Full Range YCbCr
5554288b7184 drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.IGT: success for Extend BT2020 support in iCSC and fixes (rev2)
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
` (4 preceding siblings ...)
2019-05-09 20:38 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes (rev2) Patchwork
@ 2019-05-10 5:39 ` Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-05-10 5:39 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Extend BT2020 support in iCSC and fixes (rev2)
URL : https://patchwork.freedesktop.org/series/60480/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6072_full -> Patchwork_12997_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12997_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#104108]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl9/igt@kms_cursor_crc@cursor-128x128-suspend.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl10/igt@kms_cursor_crc@cursor-128x128-suspend.html
* igt@kms_flip_tiling@flip-x-tiled:
- shard-skl: [PASS][3] -> [FAIL][4] ([fdo#108145] / [fdo#108303])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl5/igt@kms_flip_tiling@flip-x-tiled.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl10/igt@kms_flip_tiling@flip-x-tiled.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-apl5/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][7] -> [FAIL][8] ([fdo#108145] / [fdo#110403])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][9] -> [FAIL][10] ([fdo#108341])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-iclb6/igt@kms_psr@no_drrs.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109441]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-iclb3/igt@kms_psr@psr2_cursor_plane_onoff.html
#### Possible fixes ####
* igt@i915_suspend@debugfs-reader:
- shard-apl: [DMESG-WARN][13] ([fdo#108566]) -> [PASS][14] +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-apl6/igt@i915_suspend@debugfs-reader.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-apl1/igt@i915_suspend@debugfs-reader.html
* igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge:
- shard-snb: [SKIP][15] ([fdo#109271] / [fdo#109278]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-snb7/igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-snb7/igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge.html
* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [DMESG-WARN][17] ([fdo#108566]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-kbl1/igt@kms_flip@flip-vs-suspend.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-kbl5/igt@kms_flip@flip-vs-suspend.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [FAIL][19] ([fdo#100368]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl2/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl8/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][21] ([fdo#103167]) -> [PASS][22] +5 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][23] ([fdo#108145]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][25] ([fdo#103166]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-y.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-y.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [SKIP][27] ([fdo#109441]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-iclb3/igt@kms_psr@psr2_primary_mmap_gtt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][29] ([fdo#99912]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-kbl5/igt@kms_setmode@basic.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-kbl6/igt@kms_setmode@basic.html
* igt@perf@oa-exponents:
- shard-glk: [FAIL][31] ([fdo#105483]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-glk5/igt@perf@oa-exponents.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-glk4/igt@perf@oa-exponents.html
#### Warnings ####
* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-skl: [INCOMPLETE][33] ([fdo#107807]) -> [SKIP][34] ([fdo#109271])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-skl10/igt@i915_pm_rpm@modeset-pc8-residency-stress.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-skl5/igt@i915_pm_rpm@modeset-pc8-residency-stress.html
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-apl: [FAIL][35] ([fdo#103375]) -> [DMESG-WARN][36] ([fdo#108566])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6072/shard-apl5/igt@kms_cursor_crc@cursor-256x256-suspend.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12997/shard-apl8/igt@kms_cursor_crc@cursor-256x256-suspend.html
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[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#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6072 -> Patchwork_12997
CI_DRM_6072: 645586708589c3d2ac81114595e875cdfbbff385 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4976: b1d91d0228db999145405e529952ca49bab7f706 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12997: 52ef243e7805e0894631ede9c11484611c035879 @ 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_12997/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-05-10 5:39 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-09 19:11 [PATCH 0/3] Extend BT2020 support in iCSC and fixes Uma Shankar
2019-05-09 19:11 ` [PATCH 1/3] drm/i915/icl: Handle YCbCr to RGB conversion for BT2020 case Uma Shankar
2019-05-09 19:11 ` [PATCH 2/3] drm/i915/icl: Fix Y pre-offset for Full Range YCbCr Uma Shankar
2019-05-09 19:11 ` [PATCH 3/3] drm/i915/icl: Fixed Input CSC Co-efficients for BT601/709 Uma Shankar
2019-05-09 19:24 ` Ville Syrjälä
2019-05-09 19:37 ` Shankar, Uma
2019-05-09 20:18 ` [v2] " Uma Shankar
2019-05-09 19:37 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes Patchwork
2019-05-09 20:38 ` ✓ Fi.CI.BAT: success for Extend BT2020 support in iCSC and fixes (rev2) Patchwork
2019-05-10 5:39 ` ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox