diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-06 17:21:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-06 17:21:13 +1000 |
| commit | acf8294fecd4b805b408d02c321a0fd7eef95555 (patch) | |
| tree | 1bf751f65495b72c626b5318fc33adbb1f7b5979 /drivers/gpu/drm/drm_crtc.c | |
| parent | 5b215bcff50d549d73e43c09bcccf8eebcc95bac (diff) | |
| parent | e7b96070dd9e51a8b16340411a8643d8c7d5a001 (diff) | |
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
bunch of cleanups
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
drm: mark drm_context support as legacy
drm: make sysfs device always available for minors
drm: make minor->index available early
drm: merge drm_drv.c into drm_ioctl.c
drm: move module initialization to drm_stub.c
drm: don't de-authenticate clients on master-close
drm: drop redundant drm_file->is_master
drm: extract legacy ctxbitmap flushing
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index fa2be249999..ca8bb1bc92a 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -3244,7 +3244,7 @@ int drm_mode_getfb(struct drm_device *dev, r->bpp = fb->bits_per_pixel; r->pitch = fb->pitches[0]; if (fb->funcs->create_handle) { - if (file_priv->is_master || capable(CAP_SYS_ADMIN) || + if (drm_is_master(file_priv) || capable(CAP_SYS_ADMIN) || drm_is_control_client(file_priv)) { ret = fb->funcs->create_handle(fb, file_priv, &r->handle); |