Commit 7b5b3801 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-5.7' of git://people.freedesktop.org/~sroland/linux into drm-fixes 



vmwgfx:
- change maintainers
- fix redundant assignment
- fix parameter name
- fix return value

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: "Roland Scheidegger (VMware)" <rscheidegger.oss@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200516050433.7298-1-rscheidegger.oss@gmail.com
parents b9bbe6ed 80542002

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5507,10 +5507,10 @@ F: drivers/gpu/drm/vboxvideo/ 














DRM DRIVER FOR VMWARE VIRTUAL GPU















M:	"VMware Graphics" <linux-graphics-maintainer@vmware.com>













M:	Thomas Hellstrom <thellstrom@vmware.com>













M:	Roland Scheidegger <sroland@vmware.com>















L:	dri-devel@lists.freedesktop.org















S:	Supported













T:	git git://people.freedesktop.org/~thomash/linux













T:	git git://people.freedesktop.org/~sroland/linux















F:	drivers/gpu/drm/vmwgfx/















F:	include/uapi/drm/vmwgfx_drm.h















































drivers/gpu/drm/vmwgfx/vmwgfx_drv.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -850,7 +850,7 @@ extern void vmw_bo_bo_free(struct ttm_buffer_object *bo);













extern int vmw_bo_init(struct vmw_private *dev_priv,















		       struct vmw_buffer_object *vmw_bo,















		       size_t size, struct ttm_placement *placement,













		       bool interuptable,













		       bool interruptible,















		       void (*bo_free)(struct ttm_buffer_object *bo));















extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,















				     struct ttm_object_file *tfile);

































drivers/gpu/drm/vmwgfx/vmwgfx_fence.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -515,7 +515,7 @@ bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence)













	struct vmw_fence_manager *fman = fman_from_fence(fence);































	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))













		return 1;













		return true;































	vmw_fences_update(fman);

















































drivers/gpu/drm/vmwgfx/vmwgfx_surface.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1651,7 +1651,7 @@ vmw_gb_surface_reference_internal(struct drm_device *dev,













	struct vmw_surface_metadata *metadata;















	struct ttm_base_object *base;















	uint32_t backup_handle;













	int ret = -EINVAL;













	int ret;































	ret = vmw_surface_handle_reference(dev_priv, file_priv, req->sid,















					   req->handle_type, &base);



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE