[Intel-gfx] [PATCH] drm/i915: Only wait one vblank when disabling crc if the pipe is on

[Daniel Vetter]

On Fri, Jun 06, 2014 at 06:18:01PM +0100, Damien Lespiau wrote:
> On Fri, Jun 06, 2014 at 08:22:08AM +0200, Daniel Vetter wrote:
> > +		mutex_lock(&crtc->base.mutex);
> > +		if (crtc->active)
> > +			intel_wait_for_vblank(dev, pipe);
> > +		mutex_unlock(&crtc->base.mutex);
> 
> drivers/gpu/drm/i915/i915_debugfs.c: In function ‘pipe_crc_set_source’:
> drivers/gpu/drm/i915/i915_debugfs.c:2932:3: warning: passing argument 1 of ‘mutex_lock’ from incompatible pointer type [enabled by default]
>    mutex_lock(&crtc->base.mutex);
>    ^
> In file included from include/linux/seq_file.h:7:0,
>                  from drivers/gpu/drm/i915/i915_debugfs.c:29:
> include/linux/mutex.h:158:13: note: expected ‘struct mutex *’ but argument is of type ‘struct drm_modeset_lock *’
>  extern void mutex_lock(struct mutex *lock);

Oh dang, rebase fail. Thanks for helping the blind, will fix asap.
-Daniel

>              ^
> 
> -- 
> Damien

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch