Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b40067 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/dce8: Clean up reference counting and pinning of the cursor BOs 



Take a GEM reference for and pin the new cursor BO, unpin and drop the
GEM reference for the old cursor BO in dce8 crtc_cursor_set2, and use
amdgpu_crtc->cursor_addr in dce8 set_cursor.

This fixes dce8 cursor_reset accidentally incrementing the cursor BO
pin count, and cleans up the code a little.

Port of radeon commit:
cd404af0

Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c4e0dfad

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+24 −37
Original line number Original line Diff line number Diff line
@@ -2449,34 +2449,15 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc, 
	return 0;

	return 0;

}

}





static int dce_v8_0_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj)

static void dce_v8_0_set_cursor(struct drm_crtc *crtc)

{

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct amdgpu_device *adev = crtc->dev->dev_private;

	struct amdgpu_device *adev = crtc->dev->dev_private;

	struct amdgpu_bo *aobj = gem_to_amdgpu_bo(obj);

	uint64_t gpu_addr;

	int ret;



	ret = amdgpu_bo_reserve(aobj, false);

	if (unlikely(ret != 0))

		goto fail;



	ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM, &gpu_addr);

	amdgpu_bo_unreserve(aobj);

	if (ret)

		goto fail;





	WREG32(mmCUR_SURFACE_ADDRESS_HIGH + amdgpu_crtc->crtc_offset,

	WREG32(mmCUR_SURFACE_ADDRESS_HIGH + amdgpu_crtc->crtc_offset,

	       upper_32_bits(gpu_addr));

	       upper_32_bits(amdgpu_crtc->cursor_addr));

	WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,

	WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,

	       lower_32_bits(gpu_addr));

	       lower_32_bits(amdgpu_crtc->cursor_addr));



	return 0;



fail:

	drm_gem_object_unreference_unlocked(obj);



	return ret;

}

}





static int dce_v8_0_crtc_cursor_move(struct drm_crtc *crtc,

static int dce_v8_0_crtc_cursor_move(struct drm_crtc *crtc,
@@ -2501,6 +2482,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
{

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct drm_gem_object *obj;

	struct drm_gem_object *obj;

	struct amdgpu_bo *aobj;

	int ret;

	int ret;





	if (!handle) {

	if (!handle) {
@@ -2522,6 +2504,21 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		return -ENOENT;

		return -ENOENT;

	}

	}





	aobj = gem_to_amdgpu_bo(obj);

	ret = amdgpu_bo_reserve(aobj, false);

	if (ret != 0) {

		drm_gem_object_unreference_unlocked(obj);

		return ret;

	}



	ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM, &amdgpu_crtc->cursor_addr);

	amdgpu_bo_unreserve(aobj);

	if (ret) {

		DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret);

		drm_gem_object_unreference_unlocked(obj);

		return ret;

	}



	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_width = width;

	amdgpu_crtc->cursor_height = height;

	amdgpu_crtc->cursor_height = height;
@@ -2540,11 +2537,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		amdgpu_crtc->cursor_hot_y = hot_y;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}

	}





	ret = dce_v8_0_set_cursor(crtc, obj);

	dce_v8_0_set_cursor(crtc);

	if (ret)

		DRM_ERROR("dce_v8_0_set_cursor returned %d, not changing cursor\n",

			  ret);

	else

	dce_v8_0_show_cursor(crtc);

	dce_v8_0_show_cursor(crtc);

	dce_v8_0_lock_cursor(crtc, false);

	dce_v8_0_lock_cursor(crtc, false);
@@ -2556,7 +2549,6 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
			amdgpu_bo_unpin(aobj);

			amdgpu_bo_unpin(aobj);

			amdgpu_bo_unreserve(aobj);

			amdgpu_bo_unreserve(aobj);

		}

		}

		if (amdgpu_crtc->cursor_bo != obj)

		drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo);

		drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo);

	}

	}
@@ -2567,7 +2559,6 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, 
static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)

static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)

{

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int ret;





	if (amdgpu_crtc->cursor_bo) {

	if (amdgpu_crtc->cursor_bo) {

		dce_v8_0_lock_cursor(crtc, true);

		dce_v8_0_lock_cursor(crtc, true);
@@ -2575,11 +2566,7 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) 
		dce_v8_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,

		dce_v8_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,

					    amdgpu_crtc->cursor_y);

					    amdgpu_crtc->cursor_y);





		ret = dce_v8_0_set_cursor(crtc, amdgpu_crtc->cursor_bo);

		dce_v8_0_set_cursor(crtc);

		if (ret)

			DRM_ERROR("dce_v8_0_set_cursor returned %d, not showing "

				  "cursor\n", ret);

		else

		dce_v8_0_show_cursor(crtc);

		dce_v8_0_show_cursor(crtc);





		dce_v8_0_lock_cursor(crtc, false);

		dce_v8_0_lock_cursor(crtc, false);