[Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Chris Wilson]

drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?

Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
'color_spc' is used as return port_cap[3] & color_spc, implying that it
is indeed a mask and not a boolean value.

Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 8b4b2ea52859..157a850a83a7 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
 							intel_dp->downstream_ports);
 	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
 								 intel_dp->downstream_ports,
-								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
-								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
+								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
+								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
 								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
 
 	if (INTEL_GEN(i915) >= 11) {
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Jani Nikula]

On Wed, 23 Dec 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?
>
> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
> 'color_spc' is used as return port_cap[3] & color_spc, implying that it
> is indeed a mask and not a boolean value.

So this one belongs in topic/dp-hdmi-2.1-pcon branch.

Purely based on the context this is the right thing to do, so:

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Ankit, please test the patch in case it uncovers some other
issues. It'll impact the RGB to YCbCr conversion.

BR,
Jani.


>
> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 8b4b2ea52859..157a850a83a7 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
>  							intel_dp->downstream_ports);
>  	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
>  								 intel_dp->downstream_ports,
> -								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
> -								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
> +								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
> +								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
>  								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
>  
>  	if (INTEL_GEN(i915) >= 11) {

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Bitwise or the conversion colour specifier together

[Patchwork]

== Series Details ==

Series: drm/i915/display: Bitwise or the conversion colour specifier together
URL   : https://patchwork.freedesktop.org/series/85177/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
a91fc9febda0 drm/i915/display: Bitwise or the conversion colour specifier together
-:11: WARNING:TYPO_SPELLING: 'paramter' may be misspelled - perhaps 'parameter'?
#11: 
Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter

total: 0 errors, 1 warnings, 0 checks, 10 lines checked


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display: Bitwise or the conversion colour specifier together

[Patchwork]

[-- Attachment #1.1: Type: text/plain, Size: 5494 bytes --]

== Series Details ==

Series: drm/i915/display: Bitwise or the conversion colour specifier together
URL   : https://patchwork.freedesktop.org/series/85177/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9515 -> Patchwork_19199
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_19199 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_19199, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/index.html

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_19199:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@evict:
    - fi-kbl-soraka:      [PASS][1] -> [INCOMPLETE][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-kbl-soraka/igt@i915_selftest@live@evict.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-kbl-soraka/igt@i915_selftest@live@evict.html

  * igt@i915_selftest@live@gem:
    - fi-kbl-soraka:      [PASS][3] -> [DMESG-WARN][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-kbl-soraka/igt@i915_selftest@live@gem.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-kbl-soraka/igt@i915_selftest@live@gem.html

  
Known issues
------------

  Here are the changes found in Patchwork_19199 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@fbdev@read:
    - fi-tgl-y:           [PASS][5] -> [DMESG-WARN][6] ([i915#402]) +2 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-tgl-y/igt@fbdev@read.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-tgl-y/igt@fbdev@read.html

  * igt@fbdev@write:
    - fi-bdw-gvtdvm:      NOTRUN -> [SKIP][7] ([fdo#109271]) +5 similar issues
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-bdw-gvtdvm/igt@fbdev@write.html

  * igt@gem_exec_suspend@basic-s0:
    - fi-bdw-gvtdvm:      NOTRUN -> [INCOMPLETE][8] ([i915#146])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-bdw-gvtdvm/igt@gem_exec_suspend@basic-s0.html

  * igt@i915_selftest@live@execlists:
    - fi-apl-guc:         [PASS][9] -> [DMESG-WARN][10] ([i915#1037])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-apl-guc/igt@i915_selftest@live@execlists.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-apl-guc/igt@i915_selftest@live@execlists.html

  * igt@i915_selftest@live@ring_submission:
    - fi-apl-guc:         [PASS][11] -> [DMESG-WARN][12] ([i915#203]) +24 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-apl-guc/igt@i915_selftest@live@ring_submission.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-apl-guc/igt@i915_selftest@live@ring_submission.html

  * igt@runner@aborted:
    - fi-bdw-5557u:       NOTRUN -> [FAIL][13] ([i915#2029])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-bdw-5557u/igt@runner@aborted.html
    - fi-kbl-soraka:      NOTRUN -> [FAIL][14] ([i915#1436] / [i915#2295])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-kbl-soraka/igt@runner@aborted.html

  
#### Possible fixes ####

  * igt@kms_chamelium@hdmi-crc-fast:
    - fi-kbl-7500u:       [DMESG-WARN][15] -> [PASS][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html

  * igt@prime_vgem@basic-write:
    - fi-tgl-y:           [DMESG-WARN][17] ([i915#402]) -> [PASS][18] +1 similar issue
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9515/fi-tgl-y/igt@prime_vgem@basic-write.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/fi-tgl-y/igt@prime_vgem@basic-write.html

  
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [i915#1037]: https://gitlab.freedesktop.org/drm/intel/issues/1037
  [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
  [i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
  [i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
  [i915#203]: https://gitlab.freedesktop.org/drm/intel/issues/203
  [i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
  [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402


Participating hosts (42 -> 38)
------------------------------

  Additional (1): fi-bdw-gvtdvm 
  Missing    (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_9515 -> Patchwork_19199

  CI-20190529: 20190529
  CI_DRM_9515: fc7c8ab3de81a7382017db8cdb35baae97c150f0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5918: 137c8f1edd9cc769e8a62808c6dcd36b233e2d05 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_19199: a91fc9febda0737464f414af8e947e48e7e3dade @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

a91fc9febda0 drm/i915/display: Bitwise or the conversion colour specifier together

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19199/index.html

[-- Attachment #1.2: Type: text/html, Size: 6462 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Nautiyal, Ankit K]

Thanks Chris to catch this.

This definitely should be bitwise Operator, as mentioned by Jani is 
right thing to do.

The PCON which I had access to, had the F/W which was using 303Ch 
(previously proposed) for color conversion capability, instead of what 
is latest mentioned in the spec ie. 83h.

While testing, I had to skip this line of code, and hardcoded to older 
register ie. 303Ch.

I Will get this patch tested and update.


Thanks & Regards,

Ankit


On 12/23/2020 4:21 PM, Jani Nikula wrote:
> On Wed, 23 Dec 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?
>>
>> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
>> 'color_spc' is used as return port_cap[3] & color_spc, implying that it
>> is indeed a mask and not a boolean value.
> So this one belongs in topic/dp-hdmi-2.1-pcon branch.
>
> Purely based on the context this is the right thing to do, so:
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> Ankit, please test the patch in case it uncovers some other
> issues. It'll impact the RGB to YCbCr conversion.
>
> BR,
> Jani.
>
>
>> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Uma Shankar <uma.shankar@intel.com>
>> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> ---
>>   drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>> index 8b4b2ea52859..157a850a83a7 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
>>   							intel_dp->downstream_ports);
>>   	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
>>   								 intel_dp->downstream_ports,
>> -								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
>> -								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
>> +								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
>> +								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
>>   								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
>>   
>>   	if (INTEL_GEN(i915) >= 11) {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Jani Nikula]

On Thu, 24 Dec 2020, "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com> wrote:
> Thanks Chris to catch this.
>
> This definitely should be bitwise Operator, as mentioned by Jani is 
> right thing to do.
>
> The PCON which I had access to, had the F/W which was using 303Ch 
> (previously proposed) for color conversion capability, instead of what 
> is latest mentioned in the spec ie. 83h.
>
> While testing, I had to skip this line of code, and hardcoded to older 
> register ie. 303Ch.
>
> I Will get this patch tested and update.

In the mean time, the topic/dp-hdmi-2.1-pcon branch has been merged to
drm-next and backmerged to drm-intel-next. So drm-intel-next is where
the fixes should now land.

BR,
Jani.


>
>
> Thanks & Regards,
>
> Ankit
>
>
> On 12/23/2020 4:21 PM, Jani Nikula wrote:
>> On Wed, 23 Dec 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?
>>>
>>> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
>>> 'color_spc' is used as return port_cap[3] & color_spc, implying that it
>>> is indeed a mask and not a boolean value.
>> So this one belongs in topic/dp-hdmi-2.1-pcon branch.
>>
>> Purely based on the context this is the right thing to do, so:
>>
>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>>
>> Ankit, please test the patch in case it uncovers some other
>> issues. It'll impact the RGB to YCbCr conversion.
>>
>> BR,
>> Jani.
>>
>>
>>> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Cc: Uma Shankar <uma.shankar@intel.com>
>>> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>>> index 8b4b2ea52859..157a850a83a7 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>>> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
>>>   							intel_dp->downstream_ports);
>>>   	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
>>>   								 intel_dp->downstream_ports,
>>> -								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
>>> -								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
>>> +								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
>>> +								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
>>>   								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
>>>   
>>>   	if (INTEL_GEN(i915) >= 11) {
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Jani Nikula]

On Fri, 08 Jan 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> On Thu, 24 Dec 2020, "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com> wrote:
>> Thanks Chris to catch this.
>>
>> This definitely should be bitwise Operator, as mentioned by Jani is 
>> right thing to do.
>>
>> The PCON which I had access to, had the F/W which was using 303Ch 
>> (previously proposed) for color conversion capability, instead of what 
>> is latest mentioned in the spec ie. 83h.
>>
>> While testing, I had to skip this line of code, and hardcoded to older 
>> register ie. 303Ch.
>>
>> I Will get this patch tested and update.
>
> In the mean time, the topic/dp-hdmi-2.1-pcon branch has been merged to
> drm-next and backmerged to drm-intel-next. So drm-intel-next is where
> the fixes should now land.

Ankit, where are we with this? I'm anxious to merge this.

BR,
Jani.



>
> BR,
> Jani.
>
>
>>
>>
>> Thanks & Regards,
>>
>> Ankit
>>
>>
>> On 12/23/2020 4:21 PM, Jani Nikula wrote:
>>> On Wed, 23 Dec 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>>> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?
>>>>
>>>> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
>>>> 'color_spc' is used as return port_cap[3] & color_spc, implying that it
>>>> is indeed a mask and not a boolean value.
>>> So this one belongs in topic/dp-hdmi-2.1-pcon branch.
>>>
>>> Purely based on the context this is the right thing to do, so:
>>>
>>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>>>
>>> Ankit, please test the patch in case it uncovers some other
>>> issues. It'll impact the RGB to YCbCr conversion.
>>>
>>> BR,
>>> Jani.
>>>
>>>
>>>> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
>>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>> Cc: Uma Shankar <uma.shankar@intel.com>
>>>> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>> ---
>>>>   drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
>>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>>>> index 8b4b2ea52859..157a850a83a7 100644
>>>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>>>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>>>> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
>>>>   							intel_dp->downstream_ports);
>>>>   	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
>>>>   								 intel_dp->downstream_ports,
>>>> -								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
>>>> -								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
>>>> +								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
>>>> +								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
>>>>   								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
>>>>   
>>>>   	if (INTEL_GEN(i915) >= 11) {
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Nautiyal, Ankit K]

On 1/13/2021 5:22 PM, Jani Nikula wrote:
> On Fri, 08 Jan 2021, Jani Nikula <jani.nikula@intel.com> wrote:
>> On Thu, 24 Dec 2020, "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com> wrote:
>>> Thanks Chris to catch this.
>>>
>>> This definitely should be bitwise Operator, as mentioned by Jani is
>>> right thing to do.
>>>
>>> The PCON which I had access to, had the F/W which was using 303Ch
>>> (previously proposed) for color conversion capability, instead of what
>>> is latest mentioned in the spec ie. 83h.
>>>
>>> While testing, I had to skip this line of code, and hardcoded to older
>>> register ie. 303Ch.
>>>
>>> I Will get this patch tested and update.
>> In the mean time, the topic/dp-hdmi-2.1-pcon branch has been merged to
>> drm-next and backmerged to drm-intel-next. So drm-intel-next is where
>> the fixes should now land.
> Ankit, where are we with this? I'm anxious to merge this.

Jani, I checked the lastest F/W we had got for source control mode, but 
its still having support in older DPCD 303Ch and has not updated to use 
DPCD 83h.

So this patch cannot be directly tested.

Since this patch is correctly fixing to use bitwise operator, can we go 
ahead with the merge?


> BR,
> Jani.
>
>
>
>> BR,
>> Jani.
>>
>>
>>>
>>> Thanks & Regards,
>>>
>>> Ankit
>>>
>>>
>>> On 12/23/2020 4:21 PM, Jani Nikula wrote:
>>>> On Wed, 23 Dec 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op?
>>>>> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op?
>>>>>
>>>>> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter
>>>>> 'color_spc' is used as return port_cap[3] & color_spc, implying that it
>>>>> is indeed a mask and not a boolean value.
>>>> So this one belongs in topic/dp-hdmi-2.1-pcon branch.
>>>>
>>>> Purely based on the context this is the right thing to do, so:
>>>>
>>>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>>>>
>>>> Ankit, please test the patch in case it uncovers some other
>>>> issues. It'll impact the RGB to YCbCr conversion.
>>>>
>>>> BR,
>>>> Jani.
>>>>
>>>>
>>>>> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
>>>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>>> Cc: Uma Shankar <uma.shankar@intel.com>
>>>>> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>>> ---
>>>>>    drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
>>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>>>>> index 8b4b2ea52859..157a850a83a7 100644
>>>>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>>>>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>>>>> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp)
>>>>>    							intel_dp->downstream_ports);
>>>>>    	rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
>>>>>    								 intel_dp->downstream_ports,
>>>>> -								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
>>>>> -								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
>>>>> +								 DP_DS_HDMI_BT601_RGB_YCBCR_CONV |
>>>>> +								 DP_DS_HDMI_BT709_RGB_YCBCR_CONV |
>>>>>    								 DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
>>>>>    
>>>>>    	if (INTEL_GEN(i915) >= 11) {
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together

[Chris Wilson]

Quoting Nautiyal, Ankit K (2021-01-15 07:24:36)
> 
> On 1/13/2021 5:22 PM, Jani Nikula wrote:
> > On Fri, 08 Jan 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> >> On Thu, 24 Dec 2020, "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com> wrote:
> >>> Thanks Chris to catch this.
> >>>
> >>> This definitely should be bitwise Operator, as mentioned by Jani is
> >>> right thing to do.
> >>>
> >>> The PCON which I had access to, had the F/W which was using 303Ch
> >>> (previously proposed) for color conversion capability, instead of what
> >>> is latest mentioned in the spec ie. 83h.
> >>>
> >>> While testing, I had to skip this line of code, and hardcoded to older
> >>> register ie. 303Ch.
> >>>
> >>> I Will get this patch tested and update.
> >> In the mean time, the topic/dp-hdmi-2.1-pcon branch has been merged to
> >> drm-next and backmerged to drm-intel-next. So drm-intel-next is where
> >> the fixes should now land.
> > Ankit, where are we with this? I'm anxious to merge this.
> 
> Jani, I checked the lastest F/W we had got for source control mode, but 
> its still having support in older DPCD 303Ch and has not updated to use 
> DPCD 83h.
> 
> So this patch cannot be directly tested.
> 
> Since this patch is correctly fixing to use bitwise operator, can we go 
> ahead with the merge?

Pushed. One hopes we can find a way to gain coverage for wacky DPCD,
this sounds like the sort of thing we need an emulator such as chamelium
for.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx