Lock in the ironlake_panel_vdd_work()

Lock in the ironlake_panel_vdd_work()

[Konstantin Belousov]

[-- Attachment #1.1: Type: text/plain, Size: 139 bytes --]

I have a question about ironlake_panel_vdd_work(). Should it use
the device struct_mutex, or need it to be the mode_config.mutex
instead ?

[-- Attachment #1.2: Type: application/pgp-signature, Size: 196 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: Lock in the ironlake_panel_vdd_work()

[Daniel Vetter]

On Mon, Oct 31, 2011 at 03:01:33PM +0200, Konstantin Belousov wrote:
> I have a question about ironlake_panel_vdd_work(). Should it use
> the device struct_mutex, or need it to be the mode_config.mutex
> instead ?

Yeah. This was actually flagged in review by Chris and me, but seems to
have been lost in the merge. Keith?
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: Lock in the ironlake_panel_vdd_work()

[Keith Packard]

[-- Attachment #1.1: Type: text/plain, Size: 1657 bytes --]

On Mon, 31 Oct 2011 14:34:46 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, Oct 31, 2011 at 03:01:33PM +0200, Konstantin Belousov wrote:
> > I have a question about ironlake_panel_vdd_work(). Should it use
> > the device struct_mutex, or need it to be the mode_config.mutex
> > instead ?
> 
> Yeah. This was actually flagged in review by Chris and me, but seems to
> have been lost in the merge. Keith?

I thought I fixed that; it must have gotten lost in the fairly steady
set of rebasing/reworking of that patch sequence.


commit 241dedda2785f040da45576418686490431232d2
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Oct 31 11:30:10 2011 -0700

    drm/i915: Use mode_config.mutex in ironlake_panel_vdd_work
    
    Use of the struct_mutex is not correct for locking in mode setting paths.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 6611d90..30420c1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -971,9 +971,9 @@ static void ironlake_panel_vdd_work(struct work_struct *__work)
                                                 struct intel_dp, panel_vdd_work);
        struct drm_device *dev = intel_dp->base.base.dev;
 
-       mutex_lock(&dev->struct_mutex);
+       mutex_lock(&dev->mode_config.mutex);
        ironlake_panel_vdd_off_sync(intel_dp);
-       mutex_unlock(&dev->struct_mutex);
+       mutex_unlock(&dev->mode_config.mutex);
 }
 
 static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: Lock in the ironlake_panel_vdd_work()

[Daniel Vetter]

On Mon, Oct 31, 2011 at 11:33:22AM -0700, Keith Packard wrote:
> On Mon, 31 Oct 2011 14:34:46 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> > On Mon, Oct 31, 2011 at 03:01:33PM +0200, Konstantin Belousov wrote:
> > > I have a question about ironlake_panel_vdd_work(). Should it use
> > > the device struct_mutex, or need it to be the mode_config.mutex
> > > instead ?
> > 
> > Yeah. This was actually flagged in review by Chris and me, but seems to
> > have been lost in the merge. Keith?
> 
> I thought I fixed that; it must have gotten lost in the fairly steady
> set of rebasing/reworking of that patch sequence.

Yeah, I recall having seen a fixed version somewhere ...

> commit 241dedda2785f040da45576418686490431232d2
> Author: Keith Packard <keithp@keithp.com>
> Date:   Mon Oct 31 11:30:10 2011 -0700
> 
>     drm/i915: Use mode_config.mutex in ironlake_panel_vdd_work
>     
>     Use of the struct_mutex is not correct for locking in mode setting paths.
>     
>     Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48