diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0606-drm-amdgpu-dce8-Fold-set_cursor-into-show_cursor.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0606-drm-amdgpu-dce8-Fold-set_cursor-into-show_cursor.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0606-drm-amdgpu-dce8-Fold-set_cursor-into-show_cursor.patch b/common/recipes-kernel/linux/files/0606-drm-amdgpu-dce8-Fold-set_cursor-into-show_cursor.patch new file mode 100644 index 00000000..8c069e3b --- /dev/null +++ b/common/recipes-kernel/linux/files/0606-drm-amdgpu-dce8-Fold-set_cursor-into-show_cursor.patch @@ -0,0 +1,71 @@ +From c2f3418def9fc13b587912091af445d2aea793f2 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Wed, 7 Oct 2015 23:46:49 -0400 +Subject: [PATCH 0606/1050] drm/amdgpu/dce8: Fold set_cursor() into + show_cursor() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Port of radeon commit: +8991668ab4e26f985a8485719bce5d6d0623a644 + +Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 18 +++++------------- + 1 file changed, 5 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +index 3d42556..02f2100 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +@@ -2429,6 +2429,11 @@ static void dce_v8_0_show_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)); ++ + WREG32_IDX(mmCUR_CONTROL + amdgpu_crtc->crtc_offset, + CUR_CONTROL__CURSOR_EN_MASK | + (CURSOR_24_8_PRE_MULT << CUR_CONTROL__CURSOR_MODE__SHIFT) | +@@ -2467,17 +2472,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc, + return 0; + } + +-static void dce_v8_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_v8_0_crtc_cursor_move(struct drm_crtc *crtc, + int x, int y) + { +@@ -2555,7 +2549,6 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + amdgpu_crtc->cursor_hot_y = hot_y; + } + +- dce_v8_0_set_cursor(crtc); + dce_v8_0_show_cursor(crtc); + dce_v8_0_lock_cursor(crtc, false); + +@@ -2584,7 +2577,6 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) + dce_v8_0_cursor_move_locked(crtc, amdgpu_crtc->cursor_x, + amdgpu_crtc->cursor_y); + +- dce_v8_0_set_cursor(crtc); + dce_v8_0_show_cursor(crtc); + + dce_v8_0_lock_cursor(crtc, false); +-- +1.9.1 + |