* [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup
@ 2022-10-26 10:11 Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
` (9 more replies)
0 siblings, 10 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Try to fix the LVDS EDID based fixed mode setup a bit. It got broken
when I moved it to happen during connector init rather than doing
it in a roundabout way from .get_modes().
I also did a bunch of refactoring to the output setup code because
the code was a mess.
Note that a lot of the output handling (especially for multi-output
encoders) is still pretty broken so more patches probably still
coming at some point.
Ville Syrjälä (8):
drm/i915/sdvo: Filter out invalid outputs more sensibly
drm/i915/sdvo: Setup DDC fully before output init
drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
drm/i915/sdvo: Simplify output setup debugs
drm/i915/sdvo: Don't add DDC modes for LVDS
drm/i915/sdvo: Get rid of the output type<->device index stuff
drm/i915/sdvo: Reduce copy-pasta in output setup
drm/i915/sdvo: Fix debug print
drivers/gpu/drm/i915/display/intel_sdvo.c | 166 +++++++++++-----------
1 file changed, 83 insertions(+), 83 deletions(-)
--
2.37.4
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/8] drm/i915/sdvo: Filter out invalid outputs more sensibly
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
` (8 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We try to filter out the corresponding xxx1 output
if the xxx0 output is not present. But the way that is
being done is pretty awkward. Make it less so.
Cc: stable@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 29 ++++++++++++++++++-----
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index cf8e80936d8e..c6200a91a777 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2925,16 +2925,33 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
return false;
}
-static bool
-intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
+static u16 intel_sdvo_filter_output_flags(u16 flags)
{
+ flags &= SDVO_OUTPUT_MASK;
+
/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
+ if (!(flags & SDVO_OUTPUT_TMDS0))
+ flags &= ~SDVO_OUTPUT_TMDS1;
+
+ if (!(flags & SDVO_OUTPUT_RGB0))
+ flags &= ~SDVO_OUTPUT_RGB1;
+
+ if (!(flags & SDVO_OUTPUT_LVDS0))
+ flags &= ~SDVO_OUTPUT_LVDS1;
+
+ return flags;
+}
+
+static bool
+intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
+{
+ flags = intel_sdvo_filter_output_flags(flags);
if (flags & SDVO_OUTPUT_TMDS0)
if (!intel_sdvo_dvi_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK)
+ if (flags & SDVO_OUTPUT_TMDS1)
if (!intel_sdvo_dvi_init(intel_sdvo, 1))
return false;
@@ -2955,7 +2972,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (!intel_sdvo_analog_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK)
+ if (flags & SDVO_OUTPUT_RGB1)
if (!intel_sdvo_analog_init(intel_sdvo, 1))
return false;
@@ -2963,11 +2980,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (!intel_sdvo_lvds_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK)
+ if (flags & SDVO_OUTPUT_LVDS1)
if (!intel_sdvo_lvds_init(intel_sdvo, 1))
return false;
- if ((flags & SDVO_OUTPUT_MASK) == 0) {
+ if (flags == 0) {
unsigned char bytes[2];
intel_sdvo->controlled_output = 0;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 1/8] drm/i915/sdvo: Filter out invalid outputs more sensibly
@ 2022-10-26 10:11 ` Ville Syrjala
0 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We try to filter out the corresponding xxx1 output
if the xxx0 output is not present. But the way that is
being done is pretty awkward. Make it less so.
Cc: stable@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 29 ++++++++++++++++++-----
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index cf8e80936d8e..c6200a91a777 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2925,16 +2925,33 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
return false;
}
-static bool
-intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
+static u16 intel_sdvo_filter_output_flags(u16 flags)
{
+ flags &= SDVO_OUTPUT_MASK;
+
/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
+ if (!(flags & SDVO_OUTPUT_TMDS0))
+ flags &= ~SDVO_OUTPUT_TMDS1;
+
+ if (!(flags & SDVO_OUTPUT_RGB0))
+ flags &= ~SDVO_OUTPUT_RGB1;
+
+ if (!(flags & SDVO_OUTPUT_LVDS0))
+ flags &= ~SDVO_OUTPUT_LVDS1;
+
+ return flags;
+}
+
+static bool
+intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
+{
+ flags = intel_sdvo_filter_output_flags(flags);
if (flags & SDVO_OUTPUT_TMDS0)
if (!intel_sdvo_dvi_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK)
+ if (flags & SDVO_OUTPUT_TMDS1)
if (!intel_sdvo_dvi_init(intel_sdvo, 1))
return false;
@@ -2955,7 +2972,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (!intel_sdvo_analog_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK)
+ if (flags & SDVO_OUTPUT_RGB1)
if (!intel_sdvo_analog_init(intel_sdvo, 1))
return false;
@@ -2963,11 +2980,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (!intel_sdvo_lvds_init(intel_sdvo, 0))
return false;
- if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK)
+ if (flags & SDVO_OUTPUT_LVDS1)
if (!intel_sdvo_lvds_init(intel_sdvo, 1))
return false;
- if ((flags & SDVO_OUTPUT_MASK) == 0) {
+ if (flags == 0) {
unsigned char bytes[2];
intel_sdvo->controlled_output = 0;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
` (8 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Call intel_sdvo_select_ddc_bus() before initializing any
of the outputs. And before that is functional (assuming no VBT)
we have to set up the controlled_outputs thing. Otherwise DDC
won't be functional during the output init but LVDS really
needs it for the fixed mode setup.
Note that the whole multi output support still looks very
bogus, and more work will be needed to make it correct.
But for now this should at least fix the LVDS EDID fixed mode
setup.
Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index c6200a91a777..ccf81d616cb4 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
if (!intel_sdvo_connector)
return false;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
- }
intel_connector = &intel_sdvo_connector->base;
connector = &intel_connector->base;
@@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
- intel_sdvo->controlled_output |= type;
intel_sdvo_connector->output_flag = type;
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
@@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_DAC;
connector->connector_type = DRM_MODE_CONNECTOR_VGA;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
- }
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
- }
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
static bool
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
{
+ struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
+
flags = intel_sdvo_filter_output_flags(flags);
+ intel_sdvo->controlled_output = flags;
+
+ intel_sdvo_select_ddc_bus(i915, intel_sdvo);
+
if (flags & SDVO_OUTPUT_TMDS0)
if (!intel_sdvo_dvi_init(intel_sdvo, 0))
return false;
@@ -2987,7 +2983,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (flags == 0) {
unsigned char bytes[2];
- intel_sdvo->controlled_output = 0;
memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
SDVO_NAME(intel_sdvo),
@@ -3399,8 +3394,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
*/
intel_sdvo->base.cloneable = 0;
- intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);
-
/* Set the input timing to the screen. Assume always input 0. */
if (!intel_sdvo_set_target_input(intel_sdvo))
goto err_output;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
@ 2022-10-26 10:11 ` Ville Syrjala
0 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Call intel_sdvo_select_ddc_bus() before initializing any
of the outputs. And before that is functional (assuming no VBT)
we have to set up the controlled_outputs thing. Otherwise DDC
won't be functional during the output init but LVDS really
needs it for the fixed mode setup.
Note that the whole multi output support still looks very
bogus, and more work will be needed to make it correct.
But for now this should at least fix the LVDS EDID fixed mode
setup.
Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index c6200a91a777..ccf81d616cb4 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
if (!intel_sdvo_connector)
return false;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
- }
intel_connector = &intel_sdvo_connector->base;
connector = &intel_connector->base;
@@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
- intel_sdvo->controlled_output |= type;
intel_sdvo_connector->output_flag = type;
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
@@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_DAC;
connector->connector_type = DRM_MODE_CONNECTOR_VGA;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
- }
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- if (device == 0) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
+ if (device == 0)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
- } else if (device == 1) {
- intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
+ else if (device == 1)
intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
- }
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
static bool
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
{
+ struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
+
flags = intel_sdvo_filter_output_flags(flags);
+ intel_sdvo->controlled_output = flags;
+
+ intel_sdvo_select_ddc_bus(i915, intel_sdvo);
+
if (flags & SDVO_OUTPUT_TMDS0)
if (!intel_sdvo_dvi_init(intel_sdvo, 0))
return false;
@@ -2987,7 +2983,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (flags == 0) {
unsigned char bytes[2];
- intel_sdvo->controlled_output = 0;
memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
SDVO_NAME(intel_sdvo),
@@ -3399,8 +3394,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
*/
intel_sdvo->base.cloneable = 0;
- intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);
-
/* Set the input timing to the screen. Assume always input 0. */
if (!intel_sdvo_set_target_input(intel_sdvo))
goto err_output;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 3/8] drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
` (8 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
drm_mode_probed_add() is unhappy about being called w/o
mode_config.mutex. Grab it during LVDS fixed mode setup
to silence the WARNs.
Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index ccf81d616cb4..1eaaa7ec580e 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2899,8 +2899,12 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
intel_panel_add_vbt_sdvo_fixed_mode(intel_connector);
if (!intel_panel_preferred_fixed_mode(intel_connector)) {
+ mutex_lock(&i915->drm.mode_config.mutex);
+
intel_ddc_get_modes(connector, &intel_sdvo->ddc);
intel_panel_add_edid_fixed_modes(intel_connector, false);
+
+ mutex_unlock(&i915->drm.mode_config.mutex);
}
intel_panel_init(intel_connector);
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 3/8] drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
@ 2022-10-26 10:11 ` Ville Syrjala
0 siblings, 0 replies; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
drm_mode_probed_add() is unhappy about being called w/o
mode_config.mutex. Grab it during LVDS fixed mode setup
to silence the WARNs.
Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index ccf81d616cb4..1eaaa7ec580e 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2899,8 +2899,12 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
intel_panel_add_vbt_sdvo_fixed_mode(intel_connector);
if (!intel_panel_preferred_fixed_mode(intel_connector)) {
+ mutex_lock(&i915->drm.mode_config.mutex);
+
intel_ddc_get_modes(connector, &intel_sdvo->ddc);
intel_panel_add_edid_fixed_modes(intel_connector, false);
+
+ mutex_unlock(&i915->drm.mode_config.mutex);
}
intel_panel_init(intel_connector);
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 4/8] drm/i915/sdvo: Simplify output setup debugs
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (2 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-27 14:38 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS Ville Syrjala
` (5 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Get rid of this funny byte based dumping of invalid output
flags and just dump it as a single hex numbers. Also do that
early since all the rest is going to get skipped anyway of
the thing is zero.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 25 ++++++++++-------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 1eaaa7ec580e..d432f70001b7 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -199,7 +199,7 @@ to_intel_sdvo_connector(struct drm_connector *connector)
container_of((conn_state), struct intel_sdvo_connector_state, base.base)
static bool
-intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags);
+intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo);
static bool
intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
struct intel_sdvo_connector *intel_sdvo_connector,
@@ -2937,11 +2937,18 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
}
static bool
-intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
+intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
{
struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
+ u16 flags;
- flags = intel_sdvo_filter_output_flags(flags);
+ flags = intel_sdvo_filter_output_flags(intel_sdvo->caps.output_flags);
+
+ if (flags == 0) {
+ DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%04x)\n",
+ SDVO_NAME(intel_sdvo), intel_sdvo->caps.output_flags);
+ return false;
+ }
intel_sdvo->controlled_output = flags;
@@ -2984,15 +2991,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
if (!intel_sdvo_lvds_init(intel_sdvo, 1))
return false;
- if (flags == 0) {
- unsigned char bytes[2];
-
- memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
- DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
- SDVO_NAME(intel_sdvo),
- bytes[0], bytes[1]);
- return false;
- }
intel_sdvo->base.pipe_mask = ~0;
return true;
@@ -3368,8 +3366,7 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
intel_sdvo->colorimetry_cap =
intel_sdvo_get_colorimetry_cap(intel_sdvo);
- if (intel_sdvo_output_setup(intel_sdvo,
- intel_sdvo->caps.output_flags) != true) {
+ if (!intel_sdvo_output_setup(intel_sdvo)) {
drm_dbg_kms(&dev_priv->drm,
"SDVO output failed to setup on %s\n",
SDVO_NAME(intel_sdvo));
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (3 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] [PATCH 4/8] drm/i915/sdvo: Simplify output setup debugs Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-27 14:42 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff Ville Syrjala
` (4 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stop enumerating the DDC modes for SDVO LVDS outputs (outside
the initial fixed mode setup). intel_panel_mode_valid() will
just reject most of them anyway, and any left over are entirely
pointless as they'll match the fixed mode hdisp+vdisp+vrefresh
so no user visible effect from using them instead of the fixed
mode.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index d432f70001b7..d7943f9a96e7 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2290,17 +2290,12 @@ static int intel_sdvo_get_tv_modes(struct drm_connector *connector)
static int intel_sdvo_get_lvds_modes(struct drm_connector *connector)
{
- struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
struct drm_i915_private *dev_priv = to_i915(connector->dev);
- int num_modes = 0;
drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name);
- num_modes += intel_panel_get_modes(to_intel_connector(connector));
- num_modes += intel_ddc_get_modes(connector, &intel_sdvo->ddc);
-
- return num_modes;
+ return intel_panel_get_modes(to_intel_connector(connector));
}
static int intel_sdvo_get_modes(struct drm_connector *connector)
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (4 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-27 14:42 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup Ville Syrjala
` (3 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Get rid of this silly output type<->device index back and
forth and just pass the output type directly to the corresponding
output init function. This was already being done for TV outputs
anyway.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 47 +++++++++--------------
1 file changed, 19 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index d7943f9a96e7..4784c05a1b71 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2622,7 +2622,7 @@ intel_sdvo_unselect_i2c_bus(struct intel_sdvo *sdvo)
}
static bool
-intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
+intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo)
{
return intel_sdvo_check_supp_encode(intel_sdvo);
}
@@ -2727,7 +2727,7 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void)
}
static bool
-intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
+intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, u16 type)
{
struct drm_encoder *encoder = &intel_sdvo->base.base;
struct drm_connector *connector;
@@ -2735,16 +2735,13 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_connector;
- DRM_DEBUG_KMS("initialising DVI device %d\n", device);
+ DRM_DEBUG_KMS("initialising DVI type 0x%x\n", type);
intel_sdvo_connector = intel_sdvo_connector_alloc();
if (!intel_sdvo_connector)
return false;
- if (device == 0)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
- else if (device == 1)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
+ intel_sdvo_connector->output_flag = type;
intel_connector = &intel_sdvo_connector->base;
connector = &intel_connector->base;
@@ -2764,7 +2761,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_TMDS;
connector->connector_type = DRM_MODE_CONNECTOR_DVID;
- if (intel_sdvo_is_hdmi_connector(intel_sdvo, device)) {
+ if (intel_sdvo_is_hdmi_connector(intel_sdvo)) {
connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
intel_sdvo_connector->is_hdmi = true;
}
@@ -2781,14 +2778,14 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
}
static bool
-intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
+intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, u16 type)
{
struct drm_encoder *encoder = &intel_sdvo->base.base;
struct drm_connector *connector;
struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_connector;
- DRM_DEBUG_KMS("initialising TV type %d\n", type);
+ DRM_DEBUG_KMS("initialising TV type 0x%x\n", type);
intel_sdvo_connector = intel_sdvo_connector_alloc();
if (!intel_sdvo_connector)
@@ -2820,14 +2817,14 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
}
static bool
-intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
+intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, u16 type)
{
struct drm_encoder *encoder = &intel_sdvo->base.base;
struct drm_connector *connector;
struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_connector;
- DRM_DEBUG_KMS("initialising analog device %d\n", device);
+ DRM_DEBUG_KMS("initialising analog type 0x%x\n", type);
intel_sdvo_connector = intel_sdvo_connector_alloc();
if (!intel_sdvo_connector)
@@ -2839,10 +2836,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_DAC;
connector->connector_type = DRM_MODE_CONNECTOR_VGA;
- if (device == 0)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
- else if (device == 1)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
+ intel_sdvo_connector->output_flag = type;
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2853,7 +2847,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
}
static bool
-intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
+intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, u16 type)
{
struct drm_encoder *encoder = &intel_sdvo->base.base;
struct drm_i915_private *i915 = to_i915(encoder->dev);
@@ -2861,7 +2855,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_connector;
- DRM_DEBUG_KMS("initialising LVDS device %d\n", device);
+ DRM_DEBUG_KMS("initialising LVDS type 0x%x\n", type);
intel_sdvo_connector = intel_sdvo_connector_alloc();
if (!intel_sdvo_connector)
@@ -2872,10 +2866,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
- if (device == 0)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
- else if (device == 1)
- intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
+ intel_sdvo_connector->output_flag = type;
if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
kfree(intel_sdvo_connector);
@@ -2950,11 +2941,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
intel_sdvo_select_ddc_bus(i915, intel_sdvo);
if (flags & SDVO_OUTPUT_TMDS0)
- if (!intel_sdvo_dvi_init(intel_sdvo, 0))
+ if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS0))
return false;
if (flags & SDVO_OUTPUT_TMDS1)
- if (!intel_sdvo_dvi_init(intel_sdvo, 1))
+ if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS1))
return false;
/* TV has no XXX1 function block */
@@ -2971,19 +2962,19 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
return false;
if (flags & SDVO_OUTPUT_RGB0)
- if (!intel_sdvo_analog_init(intel_sdvo, 0))
+ if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB0))
return false;
if (flags & SDVO_OUTPUT_RGB1)
- if (!intel_sdvo_analog_init(intel_sdvo, 1))
+ if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB1))
return false;
if (flags & SDVO_OUTPUT_LVDS0)
- if (!intel_sdvo_lvds_init(intel_sdvo, 0))
+ if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS0))
return false;
if (flags & SDVO_OUTPUT_LVDS1)
- if (!intel_sdvo_lvds_init(intel_sdvo, 1))
+ if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS1))
return false;
intel_sdvo->base.pipe_mask = ~0;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (5 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-27 14:45 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print Ville Syrjala
` (2 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Avoid having to call the output init function for each
output type separately. We can just call the right one
based on the "class" of the output.
Technically we could just walk the bits of the bitmask
but that could change the order in which we initialize
the outputs. To avoid any behavioural changes keep to
the same explicit probe order as before.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 66 +++++++++++------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 4784c05a1b71..58d147cc7633 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2922,11 +2922,38 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
return flags;
}
+static bool intel_sdvo_output_init(struct intel_sdvo *sdvo, u16 type)
+{
+ if (type & SDVO_TMDS_MASK)
+ return intel_sdvo_dvi_init(sdvo, type);
+ else if (type & SDVO_TV_MASK)
+ return intel_sdvo_tv_init(sdvo, type);
+ else if (type & SDVO_RGB_MASK)
+ return intel_sdvo_analog_init(sdvo, type);
+ else if (type & SDVO_LVDS_MASK)
+ return intel_sdvo_lvds_init(sdvo, type);
+ else
+ return false;
+}
+
static bool
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
{
+ static const u16 probe_order[] = {
+ SDVO_OUTPUT_TMDS0,
+ SDVO_OUTPUT_TMDS1,
+ /* TV has no XXX1 function block */
+ SDVO_OUTPUT_SVID0,
+ SDVO_OUTPUT_CVBS0,
+ SDVO_OUTPUT_YPRPB0,
+ SDVO_OUTPUT_RGB0,
+ SDVO_OUTPUT_RGB1,
+ SDVO_OUTPUT_LVDS0,
+ SDVO_OUTPUT_LVDS1,
+ };
struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
u16 flags;
+ int i;
flags = intel_sdvo_filter_output_flags(intel_sdvo->caps.output_flags);
@@ -2940,42 +2967,15 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
intel_sdvo_select_ddc_bus(i915, intel_sdvo);
- if (flags & SDVO_OUTPUT_TMDS0)
- if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS0))
- return false;
-
- if (flags & SDVO_OUTPUT_TMDS1)
- if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS1))
- return false;
-
- /* TV has no XXX1 function block */
- if (flags & SDVO_OUTPUT_SVID0)
- if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_SVID0))
- return false;
-
- if (flags & SDVO_OUTPUT_CVBS0)
- if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_CVBS0))
- return false;
+ for (i = 0; i < ARRAY_SIZE(probe_order); i++) {
+ u16 type = flags & probe_order[i];
- if (flags & SDVO_OUTPUT_YPRPB0)
- if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_YPRPB0))
- return false;
-
- if (flags & SDVO_OUTPUT_RGB0)
- if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB0))
- return false;
-
- if (flags & SDVO_OUTPUT_RGB1)
- if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB1))
- return false;
-
- if (flags & SDVO_OUTPUT_LVDS0)
- if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS0))
- return false;
+ if (!type)
+ continue;
- if (flags & SDVO_OUTPUT_LVDS1)
- if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS1))
+ if (!intel_sdvo_output_init(intel_sdvo, type))
return false;
+ }
intel_sdvo->base.pipe_mask = ~0;
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (6 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup Ville Syrjala
@ 2022-10-26 10:11 ` Ville Syrjala
2022-10-27 14:48 ` Jani Nikula
2022-10-26 11:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Patchwork
2022-10-26 21:40 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
9 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjala @ 2022-10-26 10:11 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Correctly indicate which outputs we support in the debug print.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 58d147cc7633..e46b1ee4439d 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -3403,9 +3403,12 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
(intel_sdvo->caps.sdvo_inputs_mask & 0x2) ? 'Y' : 'N',
/* check currently supported outputs */
intel_sdvo->caps.output_flags &
- (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0) ? 'Y' : 'N',
+ (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0 |
+ SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_SVID0 |
+ SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_YPRPB0) ? 'Y' : 'N',
intel_sdvo->caps.output_flags &
- (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');
+ (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1 |
+ SDVO_OUTPUT_LVDS1) ? 'Y' : 'N');
return true;
err_output:
--
2.37.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (7 preceding siblings ...)
2022-10-26 10:11 ` [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print Ville Syrjala
@ 2022-10-26 11:25 ` Patchwork
2022-10-26 21:40 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
9 siblings, 0 replies; 25+ messages in thread
From: Patchwork @ 2022-10-26 11:25 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3885 bytes --]
== Series Details ==
Series: drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup
URL : https://patchwork.freedesktop.org/series/110167/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12296 -> Patchwork_110167v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/index.html
Participating hosts (41 -> 38)
------------------------------
Missing (3): fi-kbl-soraka fi-hsw-4770 fi-ctg-p8600
Known issues
------------
Here are the changes found in Patchwork_110167v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_render_tiled_blits@basic:
- fi-apl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#7056])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/fi-apl-guc/igt@gem_render_tiled_blits@basic.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/fi-apl-guc/igt@gem_render_tiled_blits@basic.html
* igt@i915_selftest@live@migrate:
- bat-adlp-4: [PASS][3] -> [INCOMPLETE][4] ([i915#7308])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/bat-adlp-4/igt@i915_selftest@live@migrate.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/bat-adlp-4/igt@i915_selftest@live@migrate.html
* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][5] ([i915#4312])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/bat-adlp-4/igt@runner@aborted.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_pm:
- {bat-adln-1}: [DMESG-FAIL][6] ([i915#4258]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/bat-adln-1/igt@i915_selftest@live@gt_pm.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/bat-adln-1/igt@i915_selftest@live@gt_pm.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5828]: https://gitlab.freedesktop.org/drm/intel/issues/5828
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7029]: https://gitlab.freedesktop.org/drm/intel/issues/7029
[i915#7056]: https://gitlab.freedesktop.org/drm/intel/issues/7056
[i915#7308]: https://gitlab.freedesktop.org/drm/intel/issues/7308
Build changes
-------------
* Linux: CI_DRM_12296 -> Patchwork_110167v1
CI-20190529: 20190529
CI_DRM_12296: dc5600688adfc13fed8128d9043bab2257066646 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7026: ce0f97e7e0aa54c40049a8365b3d61773c92e588 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110167v1: dc5600688adfc13fed8128d9043bab2257066646 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
6613542fa09d drm/i915/sdvo: Fix debug print
c5fcf53343f0 drm/i915/sdvo: Reduce copy-pasta in output setup
1da2bdd43d84 drm/i915/sdvo: Get rid of the output type<->device index stuff
7bfb424234a7 drm/i915/sdvo: Don't add DDC modes for LVDS
264624d6a939 drm/i915/sdvo: Simplify output setup debugs
c81bba47b6e1 drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
2d12fc433e94 drm/i915/sdvo: Setup DDC fully before output init
ddde8400db09 drm/i915/sdvo: Filter out invalid outputs more sensibly
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/index.html
[-- Attachment #2: Type: text/html, Size: 4154 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
` (8 preceding siblings ...)
2022-10-26 11:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Patchwork
@ 2022-10-26 21:40 ` Patchwork
9 siblings, 0 replies; 25+ messages in thread
From: Patchwork @ 2022-10-26 21:40 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 49091 bytes --]
== Series Details ==
Series: drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup
URL : https://patchwork.freedesktop.org/series/110167/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12296_full -> Patchwork_110167v1_full
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with Patchwork_110167v1_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_110167v1_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (9 -> 11)
------------------------------
Additional (2): shard-rkl shard-dg1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_110167v1_full:
### IGT changes ###
#### Warnings ####
* igt@runner@aborted:
- shard-skl: ([FAIL][1], [FAIL][2], [FAIL][3], [FAIL][4], [FAIL][5], [FAIL][6]) ([i915#3002] / [i915#4312] / [i915#6949]) -> ([FAIL][7], [FAIL][8], [FAIL][9], [FAIL][10], [FAIL][11]) ([i915#3002] / [i915#4312])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/igt@runner@aborted.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl2/igt@runner@aborted.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl4/igt@runner@aborted.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/igt@runner@aborted.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/igt@runner@aborted.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl9/igt@runner@aborted.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl6/igt@runner@aborted.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@runner@aborted.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl3/igt@runner@aborted.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl10/igt@runner@aborted.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl6/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_pwrite@basic-exhaustion:
- {shard-rkl}: NOTRUN -> [INCOMPLETE][12]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-rkl-5/igt@gem_pwrite@basic-exhaustion.html
* igt@kms_vblank@pipe-d-ts-continuation-dpms-rpm:
- {shard-dg1}: NOTRUN -> [INCOMPLETE][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-dg1-15/igt@kms_vblank@pipe-d-ts-continuation-dpms-rpm.html
* igt@sysfs_timeslice_duration@idempotent@vcs0:
- {shard-dg1}: NOTRUN -> [FAIL][14] +9 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-dg1-18/igt@sysfs_timeslice_duration@idempotent@vcs0.html
Known issues
------------
Here are the changes found in Patchwork_110167v1_full that come from known issues:
### CI changes ###
#### Issues hit ####
* boot:
- shard-skl: ([PASS][15], [PASS][16], [PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25], [PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37]) -> ([PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [PASS][48], [PASS][49], [FAIL][50], [PASS][51], [PASS][52], [PASS][53], [PASS][54], [PASS][55], [PASS][56], [PASS][57], [PASS][58], [PASS][59]) ([i915#5032])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl9/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl9/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl9/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl7/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl7/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl7/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl6/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl5/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl4/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl4/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl4/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl2/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl2/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl1/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl1/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl1/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl10/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl10/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl9/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl9/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl7/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl7/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl9/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl2/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl2/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl3/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl4/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl4/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl6/boot.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl6/boot.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl6/boot.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/boot.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl10/boot.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl10/boot.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl10/boot.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/boot.html
### IGT changes ###
#### Issues hit ####
* igt@drm_mm@all:
- shard-iclb: NOTRUN -> [SKIP][60] ([i915#6433])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@drm_mm@all.html
* igt@feature_discovery@display-3x:
- shard-iclb: NOTRUN -> [SKIP][61] ([i915#1839])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@feature_discovery@display-3x.html
* igt@gem_ccs@suspend-resume:
- shard-tglb: NOTRUN -> [SKIP][62] ([i915#5325])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@gem_ccs@suspend-resume.html
* igt@gem_ctx_persistence@many-contexts:
- shard-tglb: [PASS][63] -> [FAIL][64] ([i915#2410])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb6/igt@gem_ctx_persistence@many-contexts.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb1/igt@gem_ctx_persistence@many-contexts.html
* igt@gem_eio@in-flight-suspend:
- shard-skl: [PASS][65] -> [INCOMPLETE][66] ([i915#7112])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl7/igt@gem_eio@in-flight-suspend.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl9/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][67] -> [FAIL][68] ([i915#2842]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-glk2/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [PASS][69] -> [FAIL][70] ([i915#2842]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb6/igt@gem_exec_fair@basic-pace@bcs0.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb5/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: NOTRUN -> [FAIL][71] ([i915#2842])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_params@no-vebox:
- shard-iclb: NOTRUN -> [SKIP][72] ([fdo#109283])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gem_exec_params@no-vebox.html
* igt@gem_lmem_swapping@verify-random-ccs:
- shard-skl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#4613]) +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@gem_lmem_swapping@verify-random-ccs.html
* igt@gem_pxp@create-regular-context-1:
- shard-iclb: NOTRUN -> [SKIP][74] ([i915#4270])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gem_pxp@create-regular-context-1.html
* igt@gen7_exec_parse@load-register-reg:
- shard-iclb: NOTRUN -> [SKIP][75] ([fdo#109289])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gen7_exec_parse@load-register-reg.html
* igt@gen9_exec_parse@bb-large:
- shard-iclb: NOTRUN -> [SKIP][76] ([i915#2856])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gen9_exec_parse@bb-large.html
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [PASS][77] -> [FAIL][78] ([i915#3989] / [i915#454])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb7/igt@i915_pm_dc@dc6-dpms.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- shard-iclb: NOTRUN -> [WARN][79] ([i915#2684]) +3 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
* igt@kms_atomic@atomic_plane_damage:
- shard-iclb: NOTRUN -> [SKIP][80] ([i915#4765])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_atomic@atomic_plane_damage.html
* igt@kms_big_fb@4-tiled-16bpp-rotate-180:
- shard-iclb: NOTRUN -> [SKIP][81] ([i915#5286])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_big_fb@4-tiled-16bpp-rotate-180.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][82] ([i915#5286])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_big_fb@4-tiled-32bpp-rotate-180.html
* igt@kms_big_fb@linear-16bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][83] ([fdo#111614])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_big_fb@linear-16bpp-rotate-270.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- shard-tglb: [PASS][84] -> [FAIL][85] ([i915#3743] / [i915#7246]) +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb8/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
* igt@kms_big_fb@yf-tiled-16bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][86] ([fdo#111615]) +1 similar issue
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_big_fb@yf-tiled-16bpp-rotate-180.html
* igt@kms_big_joiner@2x-modeset:
- shard-iclb: NOTRUN -> [SKIP][87] ([i915#2705])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_big_joiner@2x-modeset.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs:
- shard-iclb: NOTRUN -> [SKIP][88] ([fdo#109278]) +3 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_rc_ccs:
- shard-skl: NOTRUN -> [SKIP][89] ([fdo#109271]) +90 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][90] ([i915#3689] / [i915#3886]) +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
- shard-iclb: NOTRUN -> [SKIP][91] ([fdo#109278] / [i915#3886]) +2 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc:
- shard-tglb: NOTRUN -> [SKIP][92] ([i915#3689] / [i915#6095])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][93] ([fdo#111615] / [i915#3689])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_ccs@pipe-c-ccs-on-another-bo-yf_tiled_ccs.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#3886]) +4 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-crc-primary-rotation-180-4_tiled_dg2_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][95] ([i915#3689])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_ccs@pipe-d-crc-primary-rotation-180-4_tiled_dg2_mc_ccs.html
* igt@kms_chamelium@dp-hpd-for-each-pipe:
- shard-iclb: NOTRUN -> [SKIP][96] ([fdo#109284] / [fdo#111827]) +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_chamelium@dp-hpd-for-each-pipe.html
* igt@kms_chamelium@hdmi-crc-multiple:
- shard-skl: NOTRUN -> [SKIP][97] ([fdo#109271] / [fdo#111827]) +3 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_chamelium@hdmi-crc-multiple.html
* igt@kms_content_protection@uevent:
- shard-tglb: NOTRUN -> [SKIP][98] ([i915#6944] / [i915#7118])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_content_protection@uevent.html
* igt@kms_cursor_crc@cursor-random-512x170:
- shard-tglb: NOTRUN -> [SKIP][99] ([i915#3359])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_cursor_crc@cursor-random-512x170.html
* igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic:
- shard-tglb: NOTRUN -> [SKIP][100] ([fdo#109274] / [fdo#111825]) +1 similar issue
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic.html
* igt@kms_dsc@dsc-with-bpc-formats:
- shard-skl: NOTRUN -> [SKIP][101] ([fdo#109271] / [i915#7205])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/igt@kms_dsc@dsc-with-bpc-formats.html
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: [PASS][102] -> [FAIL][103] ([i915#4767])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/igt@kms_fbcon_fbt@psr-suspend.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_fbcon_fbt@psr-suspend.html
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-iclb: NOTRUN -> [SKIP][104] ([fdo#109274]) +2 similar issues
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_flip@2x-flip-vs-expired-vblank.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][105] -> [FAIL][106] ([i915#79])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [PASS][107] -> [FAIL][108] ([i915#79])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][109] ([i915#2587] / [i915#2672]) +1 similar issue
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][110] ([i915#2672] / [i915#3555]) +1 similar issue
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling@pipe-a-valid-mode:
- shard-glk: NOTRUN -> [SKIP][111] ([fdo#109271]) +1 similar issue
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-glk1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][112] ([i915#2672]) +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][113] ([i915#3555]) +2 similar issues
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-tglb: NOTRUN -> [SKIP][114] ([i915#2587] / [i915#2672])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode:
- shard-iclb: [PASS][115] -> [SKIP][116] ([i915#3555])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt:
- shard-tglb: NOTRUN -> [SKIP][117] ([i915#6497]) +1 similar issue
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-move:
- shard-iclb: NOTRUN -> [SKIP][118] ([fdo#109280]) +4 similar issues
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-move.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-onoff:
- shard-tglb: NOTRUN -> [SKIP][119] ([fdo#109280] / [fdo#111825]) +3 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-onoff.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-apl: [PASS][120] -> [DMESG-WARN][121] ([i915#180]) +2 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-c-edp-1:
- shard-iclb: NOTRUN -> [SKIP][122] ([i915#5176]) +2 similar issues
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@kms_plane_scaling@plane-downscale-with-modifiers-factor-0-5@pipe-c-edp-1.html
* igt@kms_plane_scaling@plane-downscale-with-rotation-factor-0-25@pipe-c-edp-1:
- shard-tglb: NOTRUN -> [SKIP][123] ([i915#5176]) +3 similar issues
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_plane_scaling@plane-downscale-with-rotation-factor-0-25@pipe-c-edp-1.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-c-edp-1:
- shard-tglb: NOTRUN -> [SKIP][124] ([i915#5235]) +3 similar issues
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-c-edp-1.html
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-tglb: NOTRUN -> [SKIP][125] ([i915#2920])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_psr2_sf@overlay-plane-update-continuous-sf.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-skl: NOTRUN -> [SKIP][126] ([fdo#109271] / [i915#658])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][127] -> [SKIP][128] ([fdo#109441]) +3 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb8/igt@kms_psr@psr2_no_drrs.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-tglb: NOTRUN -> [FAIL][129] ([i915#132] / [i915#3467]) +1 similar issue
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_rotation_crc@primary-4-tiled-reflect-x-0:
- shard-tglb: NOTRUN -> [SKIP][130] ([i915#5289])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_rotation_crc@primary-4-tiled-reflect-x-0.html
* igt@perf@polling-parameterized:
- shard-skl: [PASS][131] -> [FAIL][132] ([i915#5639])
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl10/igt@perf@polling-parameterized.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/igt@perf@polling-parameterized.html
* igt@sysfs_clients@create:
- shard-skl: NOTRUN -> [SKIP][133] ([fdo#109271] / [i915#2994])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/igt@sysfs_clients@create.html
* igt@sysfs_heartbeat_interval@precise@vecs0:
- shard-apl: [PASS][134] -> [FAIL][135] ([i915#1755])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-apl3/igt@sysfs_heartbeat_interval@precise@vecs0.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-apl7/igt@sysfs_heartbeat_interval@precise@vecs0.html
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-apl: [DMESG-WARN][136] ([i915#180]) -> [PASS][137]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-apl8/igt@gem_ctx_isolation@preservation-s3@vcs0.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-apl8/igt@gem_ctx_isolation@preservation-s3@vcs0.html
* igt@gem_ctx_persistence@many-contexts:
- shard-iclb: [INCOMPLETE][138] -> [PASS][139]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb6/igt@gem_ctx_persistence@many-contexts.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb7/igt@gem_ctx_persistence@many-contexts.html
* igt@gem_exec_balancer@parallel-bb-first:
- shard-iclb: [SKIP][140] ([i915#4525]) -> [PASS][141] +1 similar issue
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@gem_exec_balancer@parallel-bb-first.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@gem_exec_balancer@parallel-bb-first.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][142] ([i915#2842]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb7/igt@gem_exec_fair@basic-flow@rcs0.html
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb6/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][144] ([i915#2842]) -> [PASS][145]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-apl1/igt@gem_exec_fair@basic-none-solo@rcs0.html
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-apl2/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1:
- shard-skl: [FAIL][146] ([i915#2521]) -> [PASS][147]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl10/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1.html
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl5/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1.html
* igt@kms_cursor_legacy@basic-flip-before-cursor@atomic-transitions-varying-size:
- shard-skl: [FAIL][148] ([i915#3927]) -> [PASS][149]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/igt@kms_cursor_legacy@basic-flip-before-cursor@atomic-transitions-varying-size.html
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_cursor_legacy@basic-flip-before-cursor@atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [FAIL][150] ([i915#79]) -> [PASS][151] +1 similar issue
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [FAIL][152] ([i915#2122]) -> [PASS][153] +1 similar issue
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-skl3/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-skl1/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
* igt@kms_flip@wf_vblank-ts-check@c-edp1:
- shard-tglb: [INCOMPLETE][154] -> [PASS][155]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb3/igt@kms_flip@wf_vblank-ts-check@c-edp1.html
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb3/igt@kms_flip@wf_vblank-ts-check@c-edp1.html
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
- shard-iclb: [SKIP][156] ([i915#5176]) -> [PASS][157] +1 similar issue
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
* igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1:
- shard-iclb: [SKIP][158] ([i915#5235]) -> [PASS][159] +2 similar issues
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb2/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb8/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [SKIP][160] ([fdo#109441]) -> [PASS][161]
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@kms_psr@psr2_cursor_plane_move.html
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
#### Warnings ####
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-tglb: [SKIP][162] ([i915#2848]) -> [FAIL][163] ([i915#2842])
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb6/igt@gem_exec_fair@basic-pace@rcs0.html
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_pwrite@basic-exhaustion:
- shard-tglb: [WARN][164] ([i915#2658]) -> [INCOMPLETE][165] ([i915#7248])
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-tglb7/igt@gem_pwrite@basic-exhaustion.html
[165]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-tglb6/igt@gem_pwrite@basic-exhaustion.html
- shard-glk: [FAIL][166] -> [INCOMPLETE][167] ([i915#7248])
[166]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-glk5/igt@gem_pwrite@basic-exhaustion.html
[167]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-glk1/igt@gem_pwrite@basic-exhaustion.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][168] ([i915#658]) -> [SKIP][169] ([i915#588])
[168]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb7/igt@i915_pm_dc@dc3co-vpb-simulation.html
[169]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-iclb: [SKIP][170] ([fdo#111068] / [i915#658]) -> [SKIP][171] ([i915#2920])
[170]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb7/igt@kms_psr2_sf@cursor-plane-update-sf.html
[171]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-iclb: [SKIP][172] ([i915#2920]) -> [SKIP][173] ([i915#658])
[172]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb2/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html
[173]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb8/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb:
- shard-iclb: [SKIP][174] ([i915#658]) -> [SKIP][175] ([i915#2920])
[174]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html
[175]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html
* igt@runner@aborted:
- shard-iclb: ([FAIL][176], [FAIL][177], [FAIL][178], [FAIL][179], [FAIL][180], [FAIL][181]) ([i915#3002] / [i915#4312]) -> ([FAIL][182], [FAIL][183], [FAIL][184], [FAIL][185], [FAIL][186], [FAIL][187]) ([i915#3002] / [i915#4312] / [i915#7300])
[176]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb1/igt@runner@aborted.html
[177]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb8/igt@runner@aborted.html
[178]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb8/igt@runner@aborted.html
[179]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb8/igt@runner@aborted.html
[180]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb7/igt@runner@aborted.html
[181]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12296/shard-iclb3/igt@runner@aborted.html
[182]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb1/igt@runner@aborted.html
[183]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb3/igt@runner@aborted.html
[184]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb2/igt@runner@aborted.html
[185]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb1/igt@runner@aborted.html
[186]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb6/igt@runner@aborted.html
[187]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110167v1/shard-iclb5/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2410]: https://gitlab.freedesktop.org/drm/intel/issues/2410
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2435]: https://gitlab.freedesktop.org/drm/intel/issues/2435
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2848]: https://gitlab.freedesktop.org/drm/intel/issues/2848
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3467]: https://gitlab.freedesktop.org/drm/intel/issues/3467
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3639]: https://gitlab.freedesktop.org/drm/intel/issues/3639
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3810]: https://gitlab.freedesktop.org/drm/intel/issues/3810
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3927]: https://gitlab.freedesktop.org/drm/intel/issues/3927
[i915#3936]: https://gitlab.freedesktop.org/drm/intel/issues/3936
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4036]: https://gitlab.freedesktop.org/drm/intel/issues/4036
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4765]: https://gitlab.freedesktop.org/drm/intel/issues/4765
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4854]: https://gitlab.freedesktop.org/drm/intel/issues/4854
[i915#4855]: https://gitlab.freedesktop.org/drm/intel/issues/4855
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4874]: https://gitlab.freedesktop.org/drm/intel/issues/4874
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#4885]: https://gitlab.freedesktop.org/drm/intel/issues/4885
[i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5032]: https://gitlab.freedesktop.org/drm/intel/issues/5032
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6412]: https://gitlab.freedesktop.org/drm/intel/issues/6412
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6463]: https://gitlab.freedesktop.org/drm/intel/issues/6463
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6949]: https://gitlab.freedesktop.org/drm/intel/issues/6949
[i915#7112]: https://gitlab.freedesktop.org/drm/intel/issues/7112
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7142]: https://gitlab.freedesktop.org/drm/intel/issues/7142
[i915#7178]: https://gitlab.freedesktop.org/drm/intel/issues/7178
[i915#7205]: https://gitlab.freedesktop.org/drm/intel/issues/7205
[i915#7246]: https://gitlab.freedesktop.org/drm/intel/issues/7246
[i915#7247]: https://gitlab.freedesktop.org/drm/intel/issues/7247
[i915#7248]: https://gitlab.freedesktop.org/drm/intel/issues/7248
[i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
[i915#7300]: https://gitlab.freedesktop.org/drm/intel/issues/7300
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12296 -> Patchwork_110167v1
CI-20190529: 20190529
CI_DRM_12296: dc5600688adfc13fed8128d9043bab2257066646 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7026: ce0f97e7e0aa54c40049a8365b3d61773c92e588 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110167v1: dc5600688adfc13fed8128d9043bab2257066646 @ 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_110167v1/index.html
[-- Attachment #2: Type: text/html, Size: 47520 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 1/8] drm/i915/sdvo: Filter out invalid outputs more sensibly
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
(?)
@ 2022-10-27 14:32 ` Jani Nikula
-1 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:32 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx; +Cc: stable
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We try to filter out the corresponding xxx1 output
> if the xxx0 output is not present. But the way that is
> being done is pretty awkward. Make it less so.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 29 ++++++++++++++++++-----
> 1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index cf8e80936d8e..c6200a91a777 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2925,16 +2925,33 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> return false;
> }
>
> -static bool
> -intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> +static u16 intel_sdvo_filter_output_flags(u16 flags)
> {
> + flags &= SDVO_OUTPUT_MASK;
> +
> /* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
> + if (!(flags & SDVO_OUTPUT_TMDS0))
> + flags &= ~SDVO_OUTPUT_TMDS1;
> +
> + if (!(flags & SDVO_OUTPUT_RGB0))
> + flags &= ~SDVO_OUTPUT_RGB1;
> +
> + if (!(flags & SDVO_OUTPUT_LVDS0))
> + flags &= ~SDVO_OUTPUT_LVDS1;
> +
> + return flags;
> +}
> +
> +static bool
> +intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> +{
> + flags = intel_sdvo_filter_output_flags(flags);
>
> if (flags & SDVO_OUTPUT_TMDS0)
> if (!intel_sdvo_dvi_init(intel_sdvo, 0))
> return false;
>
> - if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK)
> + if (flags & SDVO_OUTPUT_TMDS1)
> if (!intel_sdvo_dvi_init(intel_sdvo, 1))
> return false;
>
> @@ -2955,7 +2972,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> if (!intel_sdvo_analog_init(intel_sdvo, 0))
> return false;
>
> - if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK)
> + if (flags & SDVO_OUTPUT_RGB1)
> if (!intel_sdvo_analog_init(intel_sdvo, 1))
> return false;
>
> @@ -2963,11 +2980,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> if (!intel_sdvo_lvds_init(intel_sdvo, 0))
> return false;
>
> - if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK)
> + if (flags & SDVO_OUTPUT_LVDS1)
> if (!intel_sdvo_lvds_init(intel_sdvo, 1))
> return false;
>
> - if ((flags & SDVO_OUTPUT_MASK) == 0) {
> + if (flags == 0) {
> unsigned char bytes[2];
>
> intel_sdvo->controlled_output = 0;
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
(?)
@ 2022-10-27 14:36 ` Jani Nikula
2022-10-27 14:49 ` Ville Syrjälä
-1 siblings, 1 reply; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:36 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx; +Cc: stable
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Call intel_sdvo_select_ddc_bus() before initializing any
> of the outputs. And before that is functional (assuming no VBT)
> we have to set up the controlled_outputs thing. Otherwise DDC
> won't be functional during the output init but LVDS really
> needs it for the fixed mode setup.
>
> Note that the whole multi output support still looks very
> bogus, and more work will be needed to make it correct.
> But for now this should at least fix the LVDS EDID fixed mode
> setup.
>
> Cc: stable@vger.kernel.org
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
> Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
> 1 file changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index c6200a91a777..ccf81d616cb4 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> if (!intel_sdvo_connector)
> return false;
>
> - if (device == 0) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
> + if (device == 0)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
> - } else if (device == 1) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
> + else if (device == 1)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
> - }
>
> intel_connector = &intel_sdvo_connector->base;
> connector = &intel_connector->base;
> @@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
> connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
>
> - intel_sdvo->controlled_output |= type;
> intel_sdvo_connector->output_flag = type;
>
> if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> @@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> encoder->encoder_type = DRM_MODE_ENCODER_DAC;
> connector->connector_type = DRM_MODE_CONNECTOR_VGA;
>
> - if (device == 0) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
> + if (device == 0)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
> - } else if (device == 1) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
> + else if (device == 1)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
> - }
>
> if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> kfree(intel_sdvo_connector);
> @@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
> connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
>
> - if (device == 0) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
> + if (device == 0)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
> - } else if (device == 1) {
> - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
> + else if (device == 1)
> intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
> - }
>
> if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> kfree(intel_sdvo_connector);
> @@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
> static bool
> intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> {
> + struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
> +
> flags = intel_sdvo_filter_output_flags(flags);
>
> + intel_sdvo->controlled_output = flags;
> +
> + intel_sdvo_select_ddc_bus(i915, intel_sdvo);
AFAICT the ->controlled_outputs member could now be removed and just
passed by value here.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> +
> if (flags & SDVO_OUTPUT_TMDS0)
> if (!intel_sdvo_dvi_init(intel_sdvo, 0))
> return false;
> @@ -2987,7 +2983,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> if (flags == 0) {
> unsigned char bytes[2];
>
> - intel_sdvo->controlled_output = 0;
> memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
> DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
> SDVO_NAME(intel_sdvo),
> @@ -3399,8 +3394,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> */
> intel_sdvo->base.cloneable = 0;
>
> - intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);
> -
> /* Set the input timing to the screen. Assume always input 0. */
> if (!intel_sdvo_set_target_input(intel_sdvo))
> goto err_output;
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 3/8] drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
(?)
@ 2022-10-27 14:37 ` Jani Nikula
-1 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:37 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx; +Cc: stable
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> drm_mode_probed_add() is unhappy about being called w/o
> mode_config.mutex. Grab it during LVDS fixed mode setup
> to silence the WARNs.
>
> Cc: stable@vger.kernel.org
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
> Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index ccf81d616cb4..1eaaa7ec580e 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2899,8 +2899,12 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> intel_panel_add_vbt_sdvo_fixed_mode(intel_connector);
>
> if (!intel_panel_preferred_fixed_mode(intel_connector)) {
> + mutex_lock(&i915->drm.mode_config.mutex);
> +
> intel_ddc_get_modes(connector, &intel_sdvo->ddc);
> intel_panel_add_edid_fixed_modes(intel_connector, false);
> +
> + mutex_unlock(&i915->drm.mode_config.mutex);
> }
>
> intel_panel_init(intel_connector);
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 4/8] drm/i915/sdvo: Simplify output setup debugs
2022-10-26 10:11 ` [Intel-gfx] [PATCH 4/8] drm/i915/sdvo: Simplify output setup debugs Ville Syrjala
@ 2022-10-27 14:38 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:38 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Get rid of this funny byte based dumping of invalid output
> flags and just dump it as a single hex numbers. Also do that
> early since all the rest is going to get skipped anyway of
> the thing is zero.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 25 ++++++++++-------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 1eaaa7ec580e..d432f70001b7 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -199,7 +199,7 @@ to_intel_sdvo_connector(struct drm_connector *connector)
> container_of((conn_state), struct intel_sdvo_connector_state, base.base)
>
> static bool
> -intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags);
> +intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo);
> static bool
> intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
> struct intel_sdvo_connector *intel_sdvo_connector,
> @@ -2937,11 +2937,18 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
> }
>
> static bool
> -intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> +intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
> {
> struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
> + u16 flags;
>
> - flags = intel_sdvo_filter_output_flags(flags);
> + flags = intel_sdvo_filter_output_flags(intel_sdvo->caps.output_flags);
> +
> + if (flags == 0) {
> + DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%04x)\n",
> + SDVO_NAME(intel_sdvo), intel_sdvo->caps.output_flags);
> + return false;
> + }
>
> intel_sdvo->controlled_output = flags;
>
> @@ -2984,15 +2991,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> if (!intel_sdvo_lvds_init(intel_sdvo, 1))
> return false;
>
> - if (flags == 0) {
> - unsigned char bytes[2];
> -
> - memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
> - DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
> - SDVO_NAME(intel_sdvo),
> - bytes[0], bytes[1]);
> - return false;
> - }
> intel_sdvo->base.pipe_mask = ~0;
>
> return true;
> @@ -3368,8 +3366,7 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> intel_sdvo->colorimetry_cap =
> intel_sdvo_get_colorimetry_cap(intel_sdvo);
>
> - if (intel_sdvo_output_setup(intel_sdvo,
> - intel_sdvo->caps.output_flags) != true) {
> + if (!intel_sdvo_output_setup(intel_sdvo)) {
> drm_dbg_kms(&dev_priv->drm,
> "SDVO output failed to setup on %s\n",
> SDVO_NAME(intel_sdvo));
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS
2022-10-26 10:11 ` [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS Ville Syrjala
@ 2022-10-27 14:42 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:42 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Stop enumerating the DDC modes for SDVO LVDS outputs (outside
> the initial fixed mode setup). intel_panel_mode_valid() will
> just reject most of them anyway, and any left over are entirely
> pointless as they'll match the fixed mode hdisp+vdisp+vrefresh
> so no user visible effect from using them instead of the fixed
> mode.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index d432f70001b7..d7943f9a96e7 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2290,17 +2290,12 @@ static int intel_sdvo_get_tv_modes(struct drm_connector *connector)
>
> static int intel_sdvo_get_lvds_modes(struct drm_connector *connector)
> {
> - struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
> - int num_modes = 0;
>
> drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
> connector->base.id, connector->name);
>
> - num_modes += intel_panel_get_modes(to_intel_connector(connector));
> - num_modes += intel_ddc_get_modes(connector, &intel_sdvo->ddc);
> -
> - return num_modes;
> + return intel_panel_get_modes(to_intel_connector(connector));
> }
>
> static int intel_sdvo_get_modes(struct drm_connector *connector)
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff
2022-10-26 10:11 ` [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff Ville Syrjala
@ 2022-10-27 14:42 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:42 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Get rid of this silly output type<->device index back and
> forth and just pass the output type directly to the corresponding
> output init function. This was already being done for TV outputs
> anyway.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 47 +++++++++--------------
> 1 file changed, 19 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index d7943f9a96e7..4784c05a1b71 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2622,7 +2622,7 @@ intel_sdvo_unselect_i2c_bus(struct intel_sdvo *sdvo)
> }
>
> static bool
> -intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
> +intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo)
> {
> return intel_sdvo_check_supp_encode(intel_sdvo);
> }
> @@ -2727,7 +2727,7 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void)
> }
>
> static bool
> -intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> +intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, u16 type)
> {
> struct drm_encoder *encoder = &intel_sdvo->base.base;
> struct drm_connector *connector;
> @@ -2735,16 +2735,13 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - DRM_DEBUG_KMS("initialising DVI device %d\n", device);
> + DRM_DEBUG_KMS("initialising DVI type 0x%x\n", type);
>
> intel_sdvo_connector = intel_sdvo_connector_alloc();
> if (!intel_sdvo_connector)
> return false;
>
> - if (device == 0)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
> - else if (device == 1)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
> + intel_sdvo_connector->output_flag = type;
>
> intel_connector = &intel_sdvo_connector->base;
> connector = &intel_connector->base;
> @@ -2764,7 +2761,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> encoder->encoder_type = DRM_MODE_ENCODER_TMDS;
> connector->connector_type = DRM_MODE_CONNECTOR_DVID;
>
> - if (intel_sdvo_is_hdmi_connector(intel_sdvo, device)) {
> + if (intel_sdvo_is_hdmi_connector(intel_sdvo)) {
> connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
> intel_sdvo_connector->is_hdmi = true;
> }
> @@ -2781,14 +2778,14 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> }
>
> static bool
> -intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> +intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, u16 type)
> {
> struct drm_encoder *encoder = &intel_sdvo->base.base;
> struct drm_connector *connector;
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - DRM_DEBUG_KMS("initialising TV type %d\n", type);
> + DRM_DEBUG_KMS("initialising TV type 0x%x\n", type);
>
> intel_sdvo_connector = intel_sdvo_connector_alloc();
> if (!intel_sdvo_connector)
> @@ -2820,14 +2817,14 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> }
>
> static bool
> -intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> +intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, u16 type)
> {
> struct drm_encoder *encoder = &intel_sdvo->base.base;
> struct drm_connector *connector;
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - DRM_DEBUG_KMS("initialising analog device %d\n", device);
> + DRM_DEBUG_KMS("initialising analog type 0x%x\n", type);
>
> intel_sdvo_connector = intel_sdvo_connector_alloc();
> if (!intel_sdvo_connector)
> @@ -2839,10 +2836,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> encoder->encoder_type = DRM_MODE_ENCODER_DAC;
> connector->connector_type = DRM_MODE_CONNECTOR_VGA;
>
> - if (device == 0)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
> - else if (device == 1)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
> + intel_sdvo_connector->output_flag = type;
>
> if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> kfree(intel_sdvo_connector);
> @@ -2853,7 +2847,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> }
>
> static bool
> -intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> +intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, u16 type)
> {
> struct drm_encoder *encoder = &intel_sdvo->base.base;
> struct drm_i915_private *i915 = to_i915(encoder->dev);
> @@ -2861,7 +2855,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - DRM_DEBUG_KMS("initialising LVDS device %d\n", device);
> + DRM_DEBUG_KMS("initialising LVDS type 0x%x\n", type);
>
> intel_sdvo_connector = intel_sdvo_connector_alloc();
> if (!intel_sdvo_connector)
> @@ -2872,10 +2866,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
> connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
>
> - if (device == 0)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
> - else if (device == 1)
> - intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
> + intel_sdvo_connector->output_flag = type;
>
> if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> kfree(intel_sdvo_connector);
> @@ -2950,11 +2941,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
> intel_sdvo_select_ddc_bus(i915, intel_sdvo);
>
> if (flags & SDVO_OUTPUT_TMDS0)
> - if (!intel_sdvo_dvi_init(intel_sdvo, 0))
> + if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS0))
> return false;
>
> if (flags & SDVO_OUTPUT_TMDS1)
> - if (!intel_sdvo_dvi_init(intel_sdvo, 1))
> + if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS1))
> return false;
>
> /* TV has no XXX1 function block */
> @@ -2971,19 +2962,19 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
> return false;
>
> if (flags & SDVO_OUTPUT_RGB0)
> - if (!intel_sdvo_analog_init(intel_sdvo, 0))
> + if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB0))
> return false;
>
> if (flags & SDVO_OUTPUT_RGB1)
> - if (!intel_sdvo_analog_init(intel_sdvo, 1))
> + if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB1))
> return false;
>
> if (flags & SDVO_OUTPUT_LVDS0)
> - if (!intel_sdvo_lvds_init(intel_sdvo, 0))
> + if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS0))
> return false;
>
> if (flags & SDVO_OUTPUT_LVDS1)
> - if (!intel_sdvo_lvds_init(intel_sdvo, 1))
> + if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS1))
> return false;
>
> intel_sdvo->base.pipe_mask = ~0;
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup
2022-10-26 10:11 ` [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup Ville Syrjala
@ 2022-10-27 14:45 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:45 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Avoid having to call the output init function for each
> output type separately. We can just call the right one
> based on the "class" of the output.
>
> Technically we could just walk the bits of the bitmask
> but that could change the order in which we initialize
> the outputs. To avoid any behavioural changes keep to
> the same explicit probe order as before.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 66 +++++++++++------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 4784c05a1b71..58d147cc7633 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2922,11 +2922,38 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
> return flags;
> }
>
> +static bool intel_sdvo_output_init(struct intel_sdvo *sdvo, u16 type)
> +{
> + if (type & SDVO_TMDS_MASK)
> + return intel_sdvo_dvi_init(sdvo, type);
> + else if (type & SDVO_TV_MASK)
> + return intel_sdvo_tv_init(sdvo, type);
> + else if (type & SDVO_RGB_MASK)
> + return intel_sdvo_analog_init(sdvo, type);
> + else if (type & SDVO_LVDS_MASK)
> + return intel_sdvo_lvds_init(sdvo, type);
> + else
> + return false;
> +}
> +
> static bool
> intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
> {
> + static const u16 probe_order[] = {
> + SDVO_OUTPUT_TMDS0,
> + SDVO_OUTPUT_TMDS1,
> + /* TV has no XXX1 function block */
> + SDVO_OUTPUT_SVID0,
> + SDVO_OUTPUT_CVBS0,
> + SDVO_OUTPUT_YPRPB0,
> + SDVO_OUTPUT_RGB0,
> + SDVO_OUTPUT_RGB1,
> + SDVO_OUTPUT_LVDS0,
> + SDVO_OUTPUT_LVDS1,
> + };
> struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
> u16 flags;
> + int i;
>
> flags = intel_sdvo_filter_output_flags(intel_sdvo->caps.output_flags);
>
> @@ -2940,42 +2967,15 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo)
>
> intel_sdvo_select_ddc_bus(i915, intel_sdvo);
>
> - if (flags & SDVO_OUTPUT_TMDS0)
> - if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS0))
> - return false;
> -
> - if (flags & SDVO_OUTPUT_TMDS1)
> - if (!intel_sdvo_dvi_init(intel_sdvo, SDVO_OUTPUT_TMDS1))
> - return false;
> -
> - /* TV has no XXX1 function block */
> - if (flags & SDVO_OUTPUT_SVID0)
> - if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_SVID0))
> - return false;
> -
> - if (flags & SDVO_OUTPUT_CVBS0)
> - if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_CVBS0))
> - return false;
> + for (i = 0; i < ARRAY_SIZE(probe_order); i++) {
> + u16 type = flags & probe_order[i];
>
> - if (flags & SDVO_OUTPUT_YPRPB0)
> - if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_YPRPB0))
> - return false;
> -
> - if (flags & SDVO_OUTPUT_RGB0)
> - if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB0))
> - return false;
> -
> - if (flags & SDVO_OUTPUT_RGB1)
> - if (!intel_sdvo_analog_init(intel_sdvo, SDVO_OUTPUT_RGB1))
> - return false;
> -
> - if (flags & SDVO_OUTPUT_LVDS0)
> - if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS0))
> - return false;
> + if (!type)
> + continue;
>
> - if (flags & SDVO_OUTPUT_LVDS1)
> - if (!intel_sdvo_lvds_init(intel_sdvo, SDVO_OUTPUT_LVDS1))
> + if (!intel_sdvo_output_init(intel_sdvo, type))
> return false;
> + }
>
> intel_sdvo->base.pipe_mask = ~0;
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print
2022-10-26 10:11 ` [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print Ville Syrjala
@ 2022-10-27 14:48 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 14:48 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Correctly indicate which outputs we support in the debug print.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Could change that to str_yes_no() or str_enabled_disabled() while at it.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 58d147cc7633..e46b1ee4439d 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -3403,9 +3403,12 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> (intel_sdvo->caps.sdvo_inputs_mask & 0x2) ? 'Y' : 'N',
> /* check currently supported outputs */
> intel_sdvo->caps.output_flags &
> - (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0) ? 'Y' : 'N',
> + (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0 |
> + SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_SVID0 |
> + SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_YPRPB0) ? 'Y' : 'N',
> intel_sdvo->caps.output_flags &
> - (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');
> + (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1 |
> + SDVO_OUTPUT_LVDS1) ? 'Y' : 'N');
> return true;
>
> err_output:
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
2022-10-27 14:36 ` Jani Nikula
@ 2022-10-27 14:49 ` Ville Syrjälä
2022-10-27 14:54 ` Ville Syrjälä
0 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjälä @ 2022-10-27 14:49 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, stable
On Thu, Oct 27, 2022 at 05:36:24PM +0300, Jani Nikula wrote:
> On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Call intel_sdvo_select_ddc_bus() before initializing any
> > of the outputs. And before that is functional (assuming no VBT)
> > we have to set up the controlled_outputs thing. Otherwise DDC
> > won't be functional during the output init but LVDS really
> > needs it for the fixed mode setup.
> >
> > Note that the whole multi output support still looks very
> > bogus, and more work will be needed to make it correct.
> > But for now this should at least fix the LVDS EDID fixed mode
> > setup.
> >
> > Cc: stable@vger.kernel.org
> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
> > Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
> > 1 file changed, 12 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> > index c6200a91a777..ccf81d616cb4 100644
> > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> > @@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> > if (!intel_sdvo_connector)
> > return false;
> >
> > - if (device == 0) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
> > + if (device == 0)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
> > - } else if (device == 1) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
> > + else if (device == 1)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
> > - }
> >
> > intel_connector = &intel_sdvo_connector->base;
> > connector = &intel_connector->base;
> > @@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> > encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
> > connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
> >
> > - intel_sdvo->controlled_output |= type;
> > intel_sdvo_connector->output_flag = type;
> >
> > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > @@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> > encoder->encoder_type = DRM_MODE_ENCODER_DAC;
> > connector->connector_type = DRM_MODE_CONNECTOR_VGA;
> >
> > - if (device == 0) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
> > + if (device == 0)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
> > - } else if (device == 1) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
> > + else if (device == 1)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
> > - }
> >
> > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > kfree(intel_sdvo_connector);
> > @@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> > encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
> > connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
> >
> > - if (device == 0) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
> > + if (device == 0)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
> > - } else if (device == 1) {
> > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
> > + else if (device == 1)
> > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
> > - }
> >
> > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > kfree(intel_sdvo_connector);
> > @@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
> > static bool
> > intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> > {
> > + struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
> > +
> > flags = intel_sdvo_filter_output_flags(flags);
> >
> > + intel_sdvo->controlled_output = flags;
> > +
> > + intel_sdvo_select_ddc_bus(i915, intel_sdvo);
>
> AFAICT the ->controlled_outputs member could now be removed and just
> passed by value here.
Hmm. True. Though the whole thing is utter garbage anyway.
intel_sdvo_guess_ddc_bus() really expects controlled_outputs
to contain only a single bit. I guess it kinda works by luck
most or the time, at least for single output devices.
I suppose I can still include the controlled_outputs nukage
into this patch.
What we really need to do is to have a ddc adapter per each
connector, and then each one can properly figure out its
own ddc bus. Right now there is some kind of horrible hack
in intel_sdvo_tmds_sink_detect() that probes all the ddc
buses if it didn't find anything on the one that got
chosen initally.
Fixing intel_sdvo_guess_ddc_bus() for that is trivial, but
I think fixing the VBT mapping stuff is a bit harder since
we now just parse that per SDVO port rather than per SDVO
output.
attached_output is another nonsense thing that needs to
get nuked, but that one should be a bit easier. Anyways,
more work clearly needed here...
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Thanks.
>
>
> > +
> > if (flags & SDVO_OUTPUT_TMDS0)
> > if (!intel_sdvo_dvi_init(intel_sdvo, 0))
> > return false;
> > @@ -2987,7 +2983,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> > if (flags == 0) {
> > unsigned char bytes[2];
> >
> > - intel_sdvo->controlled_output = 0;
> > memcpy(bytes, &intel_sdvo->caps.output_flags, 2);
> > DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",
> > SDVO_NAME(intel_sdvo),
> > @@ -3399,8 +3394,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> > */
> > intel_sdvo->base.cloneable = 0;
> >
> > - intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);
> > -
> > /* Set the input timing to the screen. Assume always input 0. */
> > if (!intel_sdvo_set_target_input(intel_sdvo))
> > goto err_output;
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
2022-10-27 14:49 ` Ville Syrjälä
@ 2022-10-27 14:54 ` Ville Syrjälä
2022-10-27 17:33 ` Jani Nikula
0 siblings, 1 reply; 25+ messages in thread
From: Ville Syrjälä @ 2022-10-27 14:54 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, stable
On Thu, Oct 27, 2022 at 05:49:53PM +0300, Ville Syrjälä wrote:
> On Thu, Oct 27, 2022 at 05:36:24PM +0300, Jani Nikula wrote:
> > On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > >
> > > Call intel_sdvo_select_ddc_bus() before initializing any
> > > of the outputs. And before that is functional (assuming no VBT)
> > > we have to set up the controlled_outputs thing. Otherwise DDC
> > > won't be functional during the output init but LVDS really
> > > needs it for the fixed mode setup.
> > >
> > > Note that the whole multi output support still looks very
> > > bogus, and more work will be needed to make it correct.
> > > But for now this should at least fix the LVDS EDID fixed mode
> > > setup.
> > >
> > > Cc: stable@vger.kernel.org
> > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
> > > Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > ---
> > > drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
> > > 1 file changed, 12 insertions(+), 19 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> > > index c6200a91a777..ccf81d616cb4 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> > > @@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> > > if (!intel_sdvo_connector)
> > > return false;
> > >
> > > - if (device == 0) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
> > > + if (device == 0)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
> > > - } else if (device == 1) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
> > > + else if (device == 1)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
> > > - }
> > >
> > > intel_connector = &intel_sdvo_connector->base;
> > > connector = &intel_connector->base;
> > > @@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> > > encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
> > > connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
> > >
> > > - intel_sdvo->controlled_output |= type;
> > > intel_sdvo_connector->output_flag = type;
> > >
> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > > @@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> > > encoder->encoder_type = DRM_MODE_ENCODER_DAC;
> > > connector->connector_type = DRM_MODE_CONNECTOR_VGA;
> > >
> > > - if (device == 0) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
> > > + if (device == 0)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
> > > - } else if (device == 1) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
> > > + else if (device == 1)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
> > > - }
> > >
> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > > kfree(intel_sdvo_connector);
> > > @@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> > > encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
> > > connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
> > >
> > > - if (device == 0) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
> > > + if (device == 0)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
> > > - } else if (device == 1) {
> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
> > > + else if (device == 1)
> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
> > > - }
> > >
> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
> > > kfree(intel_sdvo_connector);
> > > @@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
> > > static bool
> > > intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
> > > {
> > > + struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
> > > +
> > > flags = intel_sdvo_filter_output_flags(flags);
> > >
> > > + intel_sdvo->controlled_output = flags;
> > > +
> > > + intel_sdvo_select_ddc_bus(i915, intel_sdvo);
> >
> > AFAICT the ->controlled_outputs member could now be removed and just
> > passed by value here.
>
> Hmm. True. Though the whole thing is utter garbage anyway.
> intel_sdvo_guess_ddc_bus() really expects controlled_outputs
> to contain only a single bit. I guess it kinda works by luck
> most or the time, at least for single output devices.
> I suppose I can still include the controlled_outputs nukage
> into this patch.
On second though I think I'll do it as a followup. Less chance
of backport conflicts that way.
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init
2022-10-27 14:54 ` Ville Syrjälä
@ 2022-10-27 17:33 ` Jani Nikula
0 siblings, 0 replies; 25+ messages in thread
From: Jani Nikula @ 2022-10-27 17:33 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, stable
On Thu, 27 Oct 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Oct 27, 2022 at 05:49:53PM +0300, Ville Syrjälä wrote:
>> On Thu, Oct 27, 2022 at 05:36:24PM +0300, Jani Nikula wrote:
>> > On Wed, 26 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
>> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> > >
>> > > Call intel_sdvo_select_ddc_bus() before initializing any
>> > > of the outputs. And before that is functional (assuming no VBT)
>> > > we have to set up the controlled_outputs thing. Otherwise DDC
>> > > won't be functional during the output init but LVDS really
>> > > needs it for the fixed mode setup.
>> > >
>> > > Note that the whole multi output support still looks very
>> > > bogus, and more work will be needed to make it correct.
>> > > But for now this should at least fix the LVDS EDID fixed mode
>> > > setup.
>> > >
>> > > Cc: stable@vger.kernel.org
>> > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301
>> > > Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff")
>> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> > > ---
>> > > drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++--------------
>> > > 1 file changed, 12 insertions(+), 19 deletions(-)
>> > >
>> > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> > > index c6200a91a777..ccf81d616cb4 100644
>> > > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
>> > > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> > > @@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
>> > > if (!intel_sdvo_connector)
>> > > return false;
>> > >
>> > > - if (device == 0) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;
>> > > + if (device == 0)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;
>> > > - } else if (device == 1) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;
>> > > + else if (device == 1)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;
>> > > - }
>> > >
>> > > intel_connector = &intel_sdvo_connector->base;
>> > > connector = &intel_connector->base;
>> > > @@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
>> > > encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
>> > > connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
>> > >
>> > > - intel_sdvo->controlled_output |= type;
>> > > intel_sdvo_connector->output_flag = type;
>> > >
>> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
>> > > @@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
>> > > encoder->encoder_type = DRM_MODE_ENCODER_DAC;
>> > > connector->connector_type = DRM_MODE_CONNECTOR_VGA;
>> > >
>> > > - if (device == 0) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;
>> > > + if (device == 0)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;
>> > > - } else if (device == 1) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;
>> > > + else if (device == 1)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;
>> > > - }
>> > >
>> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
>> > > kfree(intel_sdvo_connector);
>> > > @@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
>> > > encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
>> > > connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
>> > >
>> > > - if (device == 0) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;
>> > > + if (device == 0)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;
>> > > - } else if (device == 1) {
>> > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;
>> > > + else if (device == 1)
>> > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;
>> > > - }
>> > >
>> > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
>> > > kfree(intel_sdvo_connector);
>> > > @@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags)
>> > > static bool
>> > > intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
>> > > {
>> > > + struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
>> > > +
>> > > flags = intel_sdvo_filter_output_flags(flags);
>> > >
>> > > + intel_sdvo->controlled_output = flags;
>> > > +
>> > > + intel_sdvo_select_ddc_bus(i915, intel_sdvo);
>> >
>> > AFAICT the ->controlled_outputs member could now be removed and just
>> > passed by value here.
>>
>> Hmm. True. Though the whole thing is utter garbage anyway.
>> intel_sdvo_guess_ddc_bus() really expects controlled_outputs
>> to contain only a single bit. I guess it kinda works by luck
>> most or the time, at least for single output devices.
>> I suppose I can still include the controlled_outputs nukage
>> into this patch.
>
> On second though I think I'll do it as a followup. Less chance
> of backport conflicts that way.
That's completely fine, it was just an observation.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2022-10-27 17:33 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 10:11 [Intel-gfx] [PATCH 0/8] drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Ville Syrjala
2022-10-26 10:11 ` [PATCH 1/8] drm/i915/sdvo: Filter out invalid outputs more sensibly Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
2022-10-27 14:32 ` Jani Nikula
2022-10-26 10:11 ` [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
2022-10-27 14:36 ` Jani Nikula
2022-10-27 14:49 ` Ville Syrjälä
2022-10-27 14:54 ` Ville Syrjälä
2022-10-27 17:33 ` Jani Nikula
2022-10-26 10:11 ` [PATCH 3/8] drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs Ville Syrjala
2022-10-26 10:11 ` [Intel-gfx] " Ville Syrjala
2022-10-27 14:37 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 4/8] drm/i915/sdvo: Simplify output setup debugs Ville Syrjala
2022-10-27 14:38 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 5/8] drm/i915/sdvo: Don't add DDC modes for LVDS Ville Syrjala
2022-10-27 14:42 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 6/8] drm/i915/sdvo: Get rid of the output type<->device index stuff Ville Syrjala
2022-10-27 14:42 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 7/8] drm/i915/sdvo: Reduce copy-pasta in output setup Ville Syrjala
2022-10-27 14:45 ` Jani Nikula
2022-10-26 10:11 ` [Intel-gfx] [PATCH 8/8] drm/i915/sdvo: Fix debug print Ville Syrjala
2022-10-27 14:48 ` Jani Nikula
2022-10-26 11:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/sdvo: Fix LVDS fixed mode setup and clean up output setup Patchwork
2022-10-26 21:40 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.