From ab37a6189bf187cc0d7b1c2972830bd4e59b0017 Mon Sep 17 00:00:00 2001 From: Mykola Lysenko Date: Thu, 28 Jan 2016 18:24:27 +0800 Subject: [PATCH 0744/1110] drm/amd/dal: small clean-up in cursor code Signed-off-by: Mykola Lysenko Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c index 6792aea..af71e87 100644 --- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c @@ -107,7 +107,7 @@ static int dm_crtc_unpin_cursor_bo_old( if (NULL != amdgpu_crtc && NULL != amdgpu_crtc->cursor_bo) { robj = gem_to_amdgpu_bo(amdgpu_crtc->cursor_bo); - ret = amdgpu_bo_reserve(robj, false); + ret = amdgpu_bo_reserve(robj, false); if (likely(ret == 0)) { ret = amdgpu_bo_unpin(robj); @@ -128,10 +128,10 @@ static int dm_crtc_unpin_cursor_bo_old( ret, amdgpu_crtc->cursor_bo); } - } - drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); - amdgpu_crtc->cursor_bo = NULL; + drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); + amdgpu_crtc->cursor_bo = NULL; + } return ret; } @@ -145,7 +145,7 @@ static int dm_crtc_pin_cursor_bo_new( struct amdgpu_crtc *amdgpu_crtc; struct amdgpu_bo *robj; struct drm_gem_object *obj; - int ret = EINVAL; + int ret = -EINVAL; if (NULL != crtc) { struct drm_device *dev = crtc->dev; -- 2.7.4