* [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug
@ 2021-01-21 6:07 Dan Carpenter
2021-01-21 9:12 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2021-01-21 6:07 UTC (permalink / raw)
To: Jani Nikula, Ankit Nautiyal
Cc: David Airlie, kernel-janitors, Lucas De Marchi, Sean Paul,
intel-gfx, Wambui Karuga
This was supposed to be | instead of ||.
Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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 8a00e609085f..9c6f427b2703 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -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) {
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug
2021-01-21 6:07 [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug Dan Carpenter
@ 2021-01-21 9:12 ` Jani Nikula
2021-01-21 9:19 ` [Intel-gfx] " Chris Wilson
0 siblings, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2021-01-21 9:12 UTC (permalink / raw)
To: Dan Carpenter, Ankit Nautiyal
Cc: David Airlie, kernel-janitors, Lucas De Marchi, Sean Paul,
Chris Wilson, intel-gfx, Wambui Karuga
On Thu, 21 Jan 2021, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> This was supposed to be | instead of ||.
>
> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
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/20201223103917.14687-1-chris@chris-wilson.co.uk
[2] http://lore.kernel.org/r/161069893278.19482.3803444937046587332@build.alporthouse.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 8a00e609085f..9c6f427b2703 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -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) {
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug
2021-01-21 9:12 ` Jani Nikula
@ 2021-01-21 9:19 ` Chris Wilson
2021-01-21 10:09 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2021-01-21 9:19 UTC (permalink / raw)
To: Ankit Nautiyal, Dan Carpenter, Jani Nikula
Cc: David Airlie, kernel-janitors, intel-gfx, Lucas De Marchi,
Sean Paul, Wambui Karuga
Quoting Jani Nikula (2021-01-21 09:12:27)
> On Thu, 21 Jan 2021, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > This was supposed to be | instead of ||.
> >
> > Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug
2021-01-21 9:19 ` [Intel-gfx] " Chris Wilson
@ 2021-01-21 10:09 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2021-01-21 10:09 UTC (permalink / raw)
To: Chris Wilson, Ankit Nautiyal, Dan Carpenter
Cc: David Airlie, kernel-janitors, intel-gfx, Lucas De Marchi,
Sean Paul, Wambui Karuga
On Thu, 21 Jan 2021, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2021-01-21 09:12:27)
>> On Thu, 21 Jan 2021, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>> > This was supposed to be | instead of ||.
>> >
>> > Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can")
>> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> 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.
Oh, it totally is. Where's my brown paper bag when I need it?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-21 10:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-21 6:07 [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug Dan Carpenter
2021-01-21 9:12 ` Jani Nikula
2021-01-21 9:19 ` [Intel-gfx] " Chris Wilson
2021-01-21 10:09 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).