Commit 02b00162 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

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: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7fbd721a

drivers/gpu/drm/drm_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,8 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 
	}



	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 {

		ret = -ENOSYS;

		goto out_err2;

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ out_unlock: 




int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer,

				  struct drm_file *file_priv,

				  unsigned flags, unsigned color,

				  struct drm_clip_rect *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,

				 struct drm_file *file_priv,

				 unsigned flags, unsigned color,

				 struct drm_clip_rect *clips,

				 unsigned num_clips)

include/drm/drm_crtc.h

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ struct drm_framebuffer_funcs { 
	 * the semantics and arguments have a one to one mapping

	 * 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 num_clips);

};