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

Commit c836e862 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix hotspot handling on pre-avivo chips 



Need to adjust CUR_OFFSET for yorigin

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent eb1300bc

drivers/gpu/drm/radeon/radeon_cursor.c

+7 −2
Original line number Diff line number Diff line
@@ -111,9 +111,11 @@ static void radeon_set_cursor(struct drm_crtc *crtc, struct drm_gem_object *obj, 


	if (ASIC_IS_AVIVO(rdev))

		WREG32(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, gpu_addr);

	else

	else {

		radeon_crtc->legacy_cursor_offset = gpu_addr - radeon_crtc->legacy_display_base_addr;

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

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, (gpu_addr-radeon_crtc->legacy_display_base_addr));

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, radeon_crtc->legacy_cursor_offset);

	}

}



int radeon_crtc_cursor_set(struct drm_crtc *crtc,
@@ -245,6 +247,9 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, 
		       (RADEON_CUR_LOCK

			| ((xorigin ? 0 : x) << 16)

			| (yorigin ? 0 : y)));

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

		WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, (radeon_crtc->legacy_cursor_offset +

								      (yorigin * 256)));

	}

	radeon_lock_cursor(crtc, false);

drivers/gpu/drm/radeon/radeon_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct radeon_crtc { 
	int cursor_width;

	int cursor_height;

	uint32_t legacy_display_base_addr;

	uint32_t legacy_cursor_offset;

};



#define RADEON_USE_RMX 1