Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 12:47:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback

Browse Source 
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>
This commit is contained in:
Thomas Hellstrom 2010-10-05 12:43:02 +02:00 committed by Dave Airlie
parent 7fbd721ad3
commit 02b001624f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/drm_crtc.c
View File

@ -1854,7 +1854,8 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
} }
if (fb->funcs->dirty) { if (fb->funcs->dirty) {
ret = fb->funcs->dirty(fb, flags, r->color, clips, num_clips); ret = fb->funcs->dirty(fb, file_priv, flags, r->color,
clips, num_clips);
} else { } else {
ret = -ENOSYS; ret = -ENOSYS;
goto out_err2; goto out_err2;

2
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
View File

@ -392,6 +392,7 @@ out_unlock:
int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,
struct drm_file *file_priv,
unsigned flags, unsigned color, unsigned flags, unsigned color,
struct drm_clip_rect *clips, struct drm_clip_rect *clips,
unsigned num_clips) unsigned num_clips)
@ -583,6 +584,7 @@ void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer)
} }
int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
struct drm_file *file_priv,
unsigned flags, unsigned color, unsigned flags, unsigned color,
struct drm_clip_rect *clips, struct drm_clip_rect *clips,
unsigned num_clips) unsigned num_clips)

3
include/drm/drm_crtc.h
View File

@ -221,7 +221,8 @@ struct drm_framebuffer_funcs {
* the semantics and arguments have a one to one mapping * the semantics and arguments have a one to one mapping
* on this function. * on this function.
*/ */
int (*dirty)(struct drm_framebuffer *framebuffer, unsigned flags, int (*dirty)(struct drm_framebuffer *framebuffer,
struct drm_file *file_priv, unsigned flags,
unsigned color, struct drm_clip_rect *clips, unsigned color, struct drm_clip_rect *clips,
unsigned num_clips); unsigned num_clips);
}; };