diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-12-04 14:13:58 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-18 10:49:08 +1000 |
| commit | 73e9efd4bddbf42d2938a150ba680b73b6126b77 (patch) | |
| tree | 146a8b66778c04efcd05f7b22c4fcb13c859ff7f /drivers/gpu/drm/qxl/qxl_display.c | |
| parent | ee61c7303f84e2ef978aaed9b9640476c63ba586 (diff) | |
| download | op-kernel-dev-73e9efd4bddbf42d2938a150ba680b73b6126b77.zip op-kernel-dev-73e9efd4bddbf42d2938a150ba680b73b6126b77.tar.gz | |
drm: Push dirtyfb ioctl kms locking down to drivers
Not all drivers will need take all the modeset locks for dirtyfb, so
push the locking down to the drivers.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_display.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 5e827c2..b8f3bc7 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -399,10 +399,14 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, struct qxl_bo *qobj; int inc = 1; + drm_modeset_lock_all(fb->dev); + qobj = gem_to_qxl_bo(qxl_fb->obj); /* if we aren't primary surface ignore this */ - if (!qobj->is_primary) + if (!qobj->is_primary) { + drm_modeset_unlock_all(fb->dev); return 0; + } if (!num_clips) { num_clips = 1; @@ -417,6 +421,9 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, qxl_draw_dirty_fb(qdev, qxl_fb, qobj, flags, color, clips, num_clips, inc); + + drm_modeset_unlock_all(fb->dev); + return 0; } |
