[PATCH] drm/i915/sdvo: fix panel_type initialization

[PATCH] drm/i915/sdvo: fix panel_type initialization

[Jani Nikula]

Commit 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT
declares an explicit panel type") started using -1 as the value for
unset panel_type. It gets initialized in intel_panel_init_alloc(), but
the SDVO code never calls it.

Call intel_panel_init_alloc() to initialize the panel, including the
panel_type.

Reported-by: Tomi Leppänen <tomi@tomin.site>
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8896
Fixes: 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT declares an explicit panel type")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: <stable@vger.kernel.org> # v6.1+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 8298a86d1334..b4faf97936b9 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2752,7 +2752,7 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void)
 	__drm_atomic_helper_connector_reset(&sdvo_connector->base.base,
 					    &conn_state->base.base);
 
-	INIT_LIST_HEAD(&sdvo_connector->base.panel.fixed_modes);
+	intel_panel_init_alloc(&sdvo_connector->base);
 
 	return sdvo_connector;
 }
-- 
2.39.2

RE: [Intel-gfx] [PATCH] drm/i915/sdvo: fix panel_type initialization

[Shankar, Uma]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Thursday, August 3, 2023 5:57 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>; Tomi Leppänen <tomi@tomin.site>;
> stable@vger.kernel.org
> Subject: [Intel-gfx] [PATCH] drm/i915/sdvo: fix panel_type initialization
> 
> Commit 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT declares an
> explicit panel type") started using -1 as the value for unset panel_type. It gets
> initialized in intel_panel_init_alloc(), but the SDVO code never calls it.
> 
> Call intel_panel_init_alloc() to initialize the panel, including the panel_type.

Change looks good to me. Thanks Jani for identifying the root cause and fixing the issue.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>

> Reported-by: Tomi Leppänen <tomi@tomin.site>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8896
> Fixes: 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT declares an explicit
> panel type")
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: <stable@vger.kernel.org> # v6.1+
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c
> b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 8298a86d1334..b4faf97936b9 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2752,7 +2752,7 @@ static struct intel_sdvo_connector
> *intel_sdvo_connector_alloc(void)
>  	__drm_atomic_helper_connector_reset(&sdvo_connector->base.base,
>  					    &conn_state->base.base);
> 
> -	INIT_LIST_HEAD(&sdvo_connector->base.panel.fixed_modes);
> +	intel_panel_init_alloc(&sdvo_connector->base);
> 
>  	return sdvo_connector;
>  }
> --
> 2.39.2

RE: [Intel-gfx] [PATCH] drm/i915/sdvo: fix panel_type initialization

[Jani Nikula]

On Fri, 04 Aug 2023, "Shankar, Uma" <uma.shankar@intel.com> wrote:
>> -----Original Message-----
>> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
>> Sent: Thursday, August 3, 2023 5:57 PM
>> To: intel-gfx@lists.freedesktop.org
>> Cc: Nikula, Jani <jani.nikula@intel.com>; Tomi Leppänen <tomi@tomin.site>;
>> stable@vger.kernel.org
>> Subject: [Intel-gfx] [PATCH] drm/i915/sdvo: fix panel_type initialization
>>
>> Commit 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT declares an
>> explicit panel type") started using -1 as the value for unset panel_type. It gets
>> initialized in intel_panel_init_alloc(), but the SDVO code never calls it.
>>
>> Call intel_panel_init_alloc() to initialize the panel, including the panel_type.
>
> Change looks good to me. Thanks Jani for identifying the root cause and fixing the issue.
> Reviewed-by: Uma Shankar <uma.shankar@intel.com>

Thanks, pushed to drm-intel-next.

BR,
Jani.

>
>> Reported-by: Tomi Leppänen <tomi@tomin.site>
>> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8896
>> Fixes: 3f9ffce5765d ("drm/i915: Do panel VBT init early if the VBT declares an explicit
>> panel type")
>> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> Cc: <stable@vger.kernel.org> # v6.1+
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c
>> b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> index 8298a86d1334..b4faf97936b9 100644
>> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
>> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> @@ -2752,7 +2752,7 @@ static struct intel_sdvo_connector
>> *intel_sdvo_connector_alloc(void)
>>       __drm_atomic_helper_connector_reset(&sdvo_connector->base.base,
>>                                           &conn_state->base.base);
>>
>> -     INIT_LIST_HEAD(&sdvo_connector->base.panel.fixed_modes);
>> +     intel_panel_init_alloc(&sdvo_connector->base);
>>
>>       return sdvo_connector;
>>  }
>> --
>> 2.39.2
>

-- 
Jani Nikula, Intel Open Source Graphics Center