Skip to content

Commit 7b5b380

Browse files
committed
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: Dave Airlie <[email protected]> From: "Roland Scheidegger (VMware)" <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents b9bbe6e + 8054200 commit 7b5b380

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5507,10 +5507,10 @@ F: drivers/gpu/drm/vboxvideo/
55075507

55085508
DRM DRIVER FOR VMWARE VIRTUAL GPU
55095509
M: "VMware Graphics" <[email protected]>
5510-
M: Thomas Hellstrom <thellstrom@vmware.com>
5510+
M: Roland Scheidegger <sroland@vmware.com>
55115511
55125512
S: Supported
5513-
T: git git://people.freedesktop.org/~thomash/linux
5513+
T: git git://people.freedesktop.org/~sroland/linux
55145514
F: drivers/gpu/drm/vmwgfx/
55155515
F: include/uapi/drm/vmwgfx_drm.h
55165516

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ extern void vmw_bo_bo_free(struct ttm_buffer_object *bo);
850850
extern int vmw_bo_init(struct vmw_private *dev_priv,
851851
struct vmw_buffer_object *vmw_bo,
852852
size_t size, struct ttm_placement *placement,
853-
bool interuptable,
853+
bool interruptible,
854854
void (*bo_free)(struct ttm_buffer_object *bo));
855855
extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,
856856
struct ttm_object_file *tfile);

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence)
515515
struct vmw_fence_manager *fman = fman_from_fence(fence);
516516

517517
if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))
518-
return 1;
518+
return true;
519519

520520
vmw_fences_update(fman);
521521

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ vmw_gb_surface_reference_internal(struct drm_device *dev,
16511651
struct vmw_surface_metadata *metadata;
16521652
struct ttm_base_object *base;
16531653
uint32_t backup_handle;
1654-
int ret = -EINVAL;
1654+
int ret;
16551655

16561656
ret = vmw_surface_handle_reference(dev_priv, file_priv, req->sid,
16571657
req->handle_type, &base);

0 commit comments

Comments
 (0)