[PATCH] drm/nouveau: fix panels using straps-based mode detection

Phil Turmel philip at turmel.org
Thu Sep 23 11:56:27 PDT 2010


On 09/23/2010 02:44 AM, Ben Skeggs wrote:
> From: Ben Skeggs <bskeggs at redhat.com>
> 
> nouveau_bios_fp_mode() zeroes the mode struct before filling in relevant
> entries.  This nukes the mode id initialised by drm_mode_create(), and
> causes warnings from idr when we try to remove the mode.
> 
> Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_connector.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index 98c214c..4b286a8 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -594,8 +594,10 @@ nouveau_connector_get_modes(struct drm_connector *connector)
>  	if (nv_encoder->dcb->type == OUTPUT_LVDS &&
>  	    (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||
>  	     dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {
> -		nv_connector->native_mode = drm_mode_create(dev);
> -		nouveau_bios_fp_mode(dev, nv_connector->native_mode);
> +		struct drm_display_mode mode;
> +
> +		nouveau_bios_fp_mode(dev, &mode);
> +		nv_connector->native_mode = drm_mode_duplicate(dev, &mode);
>  	}
>  
>  	/* Find the native mode if this is a digital panel, if we didn't

I had this same problem, and this patch fixes it.  Feel free to add:

Tested-by: Philip J. Turmel <philip at turmel.org>

Regards,

Phil


More information about the dri-devel mailing list