Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qxl/ttm: drop the unusued no wait flag to reserve function

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-5-airlied@gmail.com

+6 -6
+1 -1
drivers/gpu/drm/qxl/qxl_cmd.c
··· 588 588 { 589 589 int ret; 590 590 591 - ret = qxl_bo_reserve(surf, false); 591 + ret = qxl_bo_reserve(surf); 592 592 if (ret) 593 593 return ret; 594 594
+1 -1
drivers/gpu/drm/qxl/qxl_ioctl.c
··· 322 322 323 323 qobj = gem_to_qxl_bo(gobj); 324 324 325 - ret = qxl_bo_reserve(qobj, false); 325 + ret = qxl_bo_reserve(qobj); 326 326 if (ret) 327 327 goto out; 328 328
+2 -2
drivers/gpu/drm/qxl/qxl_object.c
··· 284 284 { 285 285 int r; 286 286 287 - r = qxl_bo_reserve(bo, false); 287 + r = qxl_bo_reserve(bo); 288 288 if (r) 289 289 return r; 290 290 ··· 302 302 { 303 303 int r; 304 304 305 - r = qxl_bo_reserve(bo, false); 305 + r = qxl_bo_reserve(bo); 306 306 if (r) 307 307 return r; 308 308
+2 -2
drivers/gpu/drm/qxl/qxl_object.h
··· 27 27 28 28 #include "qxl_drv.h" 29 29 30 - static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait) 30 + static inline int qxl_bo_reserve(struct qxl_bo *bo) 31 31 { 32 32 int r; 33 33 34 - r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL); 34 + r = ttm_bo_reserve(&bo->tbo, true, false, NULL); 35 35 if (unlikely(r != 0)) { 36 36 if (r != -ERESTARTSYS) { 37 37 struct drm_device *ddev = bo->tbo.base.dev;