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

Commit ec9353dc authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/dce11: Fold set_cursor() into show_cursor() 



Port of radeon commit:
8991668a

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

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

+5 −13
Original line number Original line Diff line number Diff line
@@ -2476,6 +2476,11 @@ static void dce_v11_0_show_cursor(struct drm_crtc *crtc) 
	struct amdgpu_device *adev = crtc->dev->dev_private;

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

	u32 tmp;

	u32 tmp;





	WREG32(mmCUR_SURFACE_ADDRESS_HIGH + amdgpu_crtc->crtc_offset,

	       upper_32_bits(amdgpu_crtc->cursor_addr));

	WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,

	       lower_32_bits(amdgpu_crtc->cursor_addr));



	tmp = RREG32_IDX(mmCUR_CONTROL + amdgpu_crtc->crtc_offset);

	tmp = RREG32_IDX(mmCUR_CONTROL + amdgpu_crtc->crtc_offset);

	tmp = REG_SET_FIELD(tmp, CUR_CONTROL, CURSOR_EN, 1);

	tmp = REG_SET_FIELD(tmp, CUR_CONTROL, CURSOR_EN, 1);

	tmp = REG_SET_FIELD(tmp, CUR_CONTROL, CURSOR_MODE, 2);

	tmp = REG_SET_FIELD(tmp, CUR_CONTROL, CURSOR_MODE, 2);
@@ -2514,17 +2519,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc, 
	return 0;

	return 0;

}

}





static void dce_v11_0_set_cursor(struct drm_crtc *crtc)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

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



	WREG32(mmCUR_SURFACE_ADDRESS_HIGH + amdgpu_crtc->crtc_offset,

	       upper_32_bits(amdgpu_crtc->cursor_addr));

	WREG32(mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,

	       lower_32_bits(amdgpu_crtc->cursor_addr));

}



static int dce_v11_0_crtc_cursor_move(struct drm_crtc *crtc,

static int dce_v11_0_crtc_cursor_move(struct drm_crtc *crtc,

				      int x, int y)

				      int x, int y)

{

{
@@ -2602,7 +2596,6 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, 
		amdgpu_crtc->cursor_hot_y = hot_y;

		amdgpu_crtc->cursor_hot_y = hot_y;

	}

	}





	dce_v11_0_set_cursor(crtc);

	dce_v11_0_show_cursor(crtc);

	dce_v11_0_show_cursor(crtc);

	dce_v11_0_lock_cursor(crtc, false);

	dce_v11_0_lock_cursor(crtc, false);
@@ -2631,7 +2624,6 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) 
		dce_v11_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,

		dce_v11_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x,

					     amdgpu_crtc->cursor_y);

					     amdgpu_crtc->cursor_y);





		dce_v11_0_set_cursor(crtc);

		dce_v11_0_show_cursor(crtc);

		dce_v11_0_show_cursor(crtc);





		dce_v11_0_lock_cursor(crtc, false);

		dce_v11_0_lock_cursor(crtc, false);