Re: + drivers-gpu-drm-i915-intel_lvdsc-fix-locking-snafu.patchadded to -mm tree

[Daniel Vetter]

I can confirm that this patch fixes the problem. I tested with the locking
validator, and it looks like locking is now fine on my hardware.

Thanks everyone for tracking down this issue.

-Daniel

On Tue, Feb 03, 2009 at 09:58:16AM +0000, Dave Airlie wrote:
> On Mon, 2 Feb 2009, Andrew Morton wrote:
> 
> > (cc's added)
> > 
> > On Sat, 31 Jan 2009 16:25:08 +0100 Daniel Vetter <daniel@xxxxxxxx> wrote:
> > 
> > > On Thu, Jan 29, 2009 at 01:48:25PM -0800, Andrew Morton wrote:
> > > > On Thu, 29 Jan 2009 13:24:17 -0800
> > > > Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:
> > > > > On Thursday, January 29, 2009 12:50 pm akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> > 
> > So I assume that it would make sense to track this as a post-2.6.28
> > regression?
> > 
> 
> From ac048e1734699dd98f4bdf4daf2b9592d4a4d38e Mon Sep 17 00:00:00 2001
> From: Dave Airlie <airlied@xxxxxxxxxx>
> Date: Tue, 3 Feb 2009 19:05:12 +1000
> Subject: [PATCH] i915: fix unneeded locking in i915 LVDS get modes code.
> 
> This code is always called under the lock from the higher layers,
> so need to go locking it here.
> 
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> ---
>  drivers/gpu/drm/i915/intel_lvds.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index b36a521..cf8da64 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -311,10 +311,8 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
>  	if (dev_priv->panel_fixed_mode != NULL) {
>  		struct drm_display_mode *mode;
>  
> -		mutex_lock(&dev->mode_config.mutex);
>  		mode = drm_mode_duplicate(dev, dev_priv->panel_fixed_mode);
>  		drm_mode_probed_add(connector, mode);
> -		mutex_unlock(&dev->mode_config.mutex);
>  
>  		return 1;
>  	}
> -- 
> 1.6.0.6
> 

-- 
Daniel Vetter
E-Mail: daniel.vetter@xxxxxxxx
Tel.: +41 (0)79 365 57 48
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/