On Mon, Nov 03, 2014 at 12:07:02AM +0100, Daniel Vetter wrote: [...] > diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h > index 28931a23d96c..70595ff565ba 100644 > --- a/include/drm/drm_modeset_lock.h > +++ b/include/drm/drm_modeset_lock.h > @@ -127,11 +127,13 @@ void drm_modeset_unlock(struct drm_modeset_lock *lock); > > struct drm_device; > struct drm_crtc; > +struct drm_plane; > > void drm_modeset_lock_all(struct drm_device *dev); > int __drm_modeset_lock_all(struct drm_device *dev, bool trylock); > void drm_modeset_unlock_all(struct drm_device *dev); > -void drm_modeset_lock_crtc(struct drm_crtc *crtc); > +void drm_modeset_lock_crtc(struct drm_crtc *crtc, > + struct drm_plane *plane); drivers/gpu/drm/vmwgfx/vmwgfx_kms.c needs updating for this change when this gets merged. Thierry
Attachment:
pgp6wIR9Tszfe.pgp
Description: PGP signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
