Commit 9c4cbb3a authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-5-airlied@gmail.com
parent bd549d35

drivers/gpu/drm/qxl/qxl_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal 
{

	int ret;



	ret = qxl_bo_reserve(surf, false);

	ret = qxl_bo_reserve(surf);

	if (ret)

		return ret;

drivers/gpu/drm/qxl/qxl_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data, 


	qobj = gem_to_qxl_bo(gobj);



	ret = qxl_bo_reserve(qobj, false);

	ret = qxl_bo_reserve(qobj);

	if (ret)

		goto out;

drivers/gpu/drm/qxl/qxl_object.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int qxl_bo_pin(struct qxl_bo *bo) 
{

	int r;



	r = qxl_bo_reserve(bo, false);

	r = qxl_bo_reserve(bo);

	if (r)

		return r;
@@ -302,7 +302,7 @@ int qxl_bo_unpin(struct qxl_bo *bo) 
{

	int r;



	r = qxl_bo_reserve(bo, false);

	r = qxl_bo_reserve(bo);

	if (r)

		return r;

drivers/gpu/drm/qxl/qxl_object.h

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ 


#include "qxl_drv.h"



static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait)

static inline int qxl_bo_reserve(struct qxl_bo *bo)

{

	int r;



	r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL);

	r = ttm_bo_reserve(&bo->tbo, true, false, NULL);

	if (unlikely(r != 0)) {

		if (r != -ERESTARTSYS) {

			struct drm_device *ddev = bo->tbo.base.dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE