diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-05 06:43:02 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-05 21:29:41 -0400 |
commit | 02b001624f0384540299d9288fdaf37b7d37c814 (patch) | |
tree | 93191693002394c0d02f9b7c4661349770ad63c9 /drivers/gpu/drm | |
parent | 7fbd721ad35f8ffec8d9a82e0e4b390cb6c9f4f7 (diff) |
drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback
This is needed for the callback to identify the caller and take
appropriate locks if needed.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 37e0b4fa482a..6985cb1da72c 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -1854,7 +1854,8 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, | |||
1854 | } | 1854 | } |
1855 | 1855 | ||
1856 | if (fb->funcs->dirty) { | 1856 | if (fb->funcs->dirty) { |
1857 | ret = fb->funcs->dirty(fb, flags, r->color, clips, num_clips); | 1857 | ret = fb->funcs->dirty(fb, file_priv, flags, r->color, |
1858 | clips, num_clips); | ||
1858 | } else { | 1859 | } else { |
1859 | ret = -ENOSYS; | 1860 | ret = -ENOSYS; |
1860 | goto out_err2; | 1861 | goto out_err2; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index f30223cafadb..073b3e1c9cc9 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
@@ -392,6 +392,7 @@ out_unlock: | |||
392 | 392 | ||
393 | 393 | ||
394 | int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, | 394 | int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, |
395 | struct drm_file *file_priv, | ||
395 | unsigned flags, unsigned color, | 396 | unsigned flags, unsigned color, |
396 | struct drm_clip_rect *clips, | 397 | struct drm_clip_rect *clips, |
397 | unsigned num_clips) | 398 | unsigned num_clips) |
@@ -583,6 +584,7 @@ void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer) | |||
583 | } | 584 | } |
584 | 585 | ||
585 | int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, | 586 | int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, |
587 | struct drm_file *file_priv, | ||
586 | unsigned flags, unsigned color, | 588 | unsigned flags, unsigned color, |
587 | struct drm_clip_rect *clips, | 589 | struct drm_clip_rect *clips, |
588 | unsigned num_clips) | 590 | unsigned num_clips) |