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

Commit 8991668a authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/radeon: Fold radeon_set_cursor() into radeon_show_cursor() 



Reviewed-by: default avatarGrigori Goronzy <greg@chown.ath.cx>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f3cbb17b

drivers/gpu/drm/radeon/radeon_cursor.c

+19 −30
Original line number Diff line number Diff line
@@ -91,15 +91,34 @@ static void radeon_show_cursor(struct drm_crtc *crtc) 
	struct radeon_device *rdev = crtc->dev->dev_private;



	if (ASIC_IS_DCE4(rdev)) {

		WREG32(EVERGREEN_CUR_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,

		       upper_32_bits(radeon_crtc->cursor_addr));

		WREG32(EVERGREEN_CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,

		       lower_32_bits(radeon_crtc->cursor_addr));

		WREG32(RADEON_MM_INDEX, EVERGREEN_CUR_CONTROL + radeon_crtc->crtc_offset);

		WREG32(RADEON_MM_DATA, EVERGREEN_CURSOR_EN |

		       EVERGREEN_CURSOR_MODE(EVERGREEN_CURSOR_24_8_PRE_MULT) |

		       EVERGREEN_CURSOR_URGENT_CONTROL(EVERGREEN_CURSOR_URGENT_1_2));

	} else if (ASIC_IS_AVIVO(rdev)) {

		if (rdev->family >= CHIP_RV770) {

			if (radeon_crtc->crtc_id)

				WREG32(R700_D2CUR_SURFACE_ADDRESS_HIGH,

				       upper_32_bits(radeon_crtc->cursor_addr));

			else

				WREG32(R700_D1CUR_SURFACE_ADDRESS_HIGH,

				       upper_32_bits(radeon_crtc->cursor_addr));

		}



		WREG32(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,

		       lower_32_bits(radeon_crtc->cursor_addr));

		WREG32(RADEON_MM_INDEX, AVIVO_D1CUR_CONTROL + radeon_crtc->crtc_offset);

		WREG32(RADEON_MM_DATA, AVIVO_D1CURSOR_EN |

		       (AVIVO_D1CURSOR_MODE_24BPP << AVIVO_D1CURSOR_MODE_SHIFT));

	} else {

		/* offset is from DISP(2)_BASE_ADDRESS */

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset,

		       radeon_crtc->cursor_addr - radeon_crtc->legacy_display_base_addr);



		switch (radeon_crtc->crtc_id) {

		case 0:

			WREG32(RADEON_MM_INDEX, RADEON_CRTC_GEN_CNTL);
@@ -228,34 +247,6 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, 
	return ret;

}



static void radeon_set_cursor(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct radeon_device *rdev = crtc->dev->dev_private;



	if (ASIC_IS_DCE4(rdev)) {

		WREG32(EVERGREEN_CUR_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,

		       upper_32_bits(radeon_crtc->cursor_addr));

		WREG32(EVERGREEN_CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,

		       lower_32_bits(radeon_crtc->cursor_addr));

	} else if (ASIC_IS_AVIVO(rdev)) {

		if (rdev->family >= CHIP_RV770) {

			if (radeon_crtc->crtc_id)

				WREG32(R700_D2CUR_SURFACE_ADDRESS_HIGH,

				       upper_32_bits(radeon_crtc->cursor_addr));

			else

				WREG32(R700_D1CUR_SURFACE_ADDRESS_HIGH,

				       upper_32_bits(radeon_crtc->cursor_addr));

		}

		WREG32(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,

		       lower_32_bits(radeon_crtc->cursor_addr));

	} else {

		/* offset is from DISP(2)_BASE_ADDRESS */

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset,

		       radeon_crtc->cursor_addr - radeon_crtc->legacy_display_base_addr);

	}

}



int radeon_crtc_cursor_set2(struct drm_crtc *crtc,

			    struct drm_file *file_priv,

			    uint32_t handle,
@@ -324,7 +315,6 @@ int radeon_crtc_cursor_set2(struct drm_crtc *crtc, 
		radeon_crtc->cursor_hot_y = hot_y;

	}



	radeon_set_cursor(crtc);

	radeon_show_cursor(crtc);



	radeon_lock_cursor(crtc, false);
@@ -362,7 +352,6 @@ void radeon_cursor_reset(struct drm_crtc *crtc) 
		radeon_cursor_move_locked(crtc, radeon_crtc->cursor_x,

					  radeon_crtc->cursor_y);



		radeon_set_cursor(crtc);

		radeon_show_cursor(crtc);



		radeon_lock_cursor(crtc, false);