Skip to contentSkip to conversation

drm/i915/dp: Fix a logical vs bitwise OR bug

PATCH In review Dan Carpenter 4 participants 5 messages Jan 21, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/dp: Fix a logical vs bitwise OR bug

This was supposed to be | instead of ||.

Fixes 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
---
 drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +2 -2
index 8a00e609085f..9c6f427b2703 100644
@@ -6955,8 +6955,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) {
Signature · 1 line
2.29.2
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/dp: Fix a logical vs bitwise OR bug

== Series Details ==

== Series Details ==

Series: drm/i915/dp: Fix a logical vs bitwise OR bug
URL : https://patchwork.freedesktop.org/series/86114/
State : failure

== Summary ==

Applying: drm/i915/dp: Fix a logical vs bitwise OR bug Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_dp.c
Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dp.c No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Dan Carpenter

This was supposed to be | instead of ||.

Fixes 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")

Thanks, but we already have the fix [1] for this that I thought was pushed by now [2].

Chris?

BR,
Jani.

[1] http://lore.kernel.org/r/[email protected]
[2] http://lore.kernel.org/r/[email protected]

Quoted 19 lines
---
 drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +2 -2
index 8a00e609085f..9c6f427b2703 100644
@@ -6955,8 +6955,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) {
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#3 lore raw

Quoting Jani Nikula (2021-01-21 09:12:27)

Quoted 10 lines · Dan Carpenter
Quoted 4 lines

This was supposed to be | instead of ||.

Fixes 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")

Thanks, but we already have the fix [1] for this that I thought was pushed by now [2].

Chris?

6b20b734bbf1 ("drm/i915/display: Bitwise or the conversion colour specifier together") in
remotes/drm-intel/drm-intel-next
remotes/drm-intel/for-linux-next
should be visible.
-Chris

maintainer
#4 lore raw
Quoted 10 lines · Chris Wilson

Quoting Jani Nikula (2021-01-21 09:12:27)

Quoted 9 lines · Dan Carpenter
Quoted 4 lines

This was supposed to be | instead of ||.

Fixes 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")

Thanks, but we already have the fix [1] for this that I thought was pushed by now [2].

Quoted 7 lines
Quoted 1 line

Chris?

6b20b734bbf1 ("drm/i915/display: Bitwise or the conversion colour specifier together") in
remotes/drm-intel/drm-intel-next
remotes/drm-intel/for-linux-next
should be visible.

Oh, it totally is. Where's my brown paper bag when I need it?

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center