Эх сурвалжийг харах

drm/amdgpu: fix cursor setting of dce6/dce8

Fixes: 7c83d7abc999 ("drm/amdgpu: Only update the CUR_SIZE register when
		necessary")
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Flora Cui 8 жил өмнө
parent
commit
a1f49cc179

+ 1 - 5
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

@@ -1944,9 +1944,7 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,
 
 
 	dce_v6_0_lock_cursor(crtc, true);
 	dce_v6_0_lock_cursor(crtc, true);
 
 
-	if (width != amdgpu_crtc->cursor_width ||
-	    height != amdgpu_crtc->cursor_height ||
-	    hot_x != amdgpu_crtc->cursor_hot_x ||
+	if (hot_x != amdgpu_crtc->cursor_hot_x ||
 	    hot_y != amdgpu_crtc->cursor_hot_y) {
 	    hot_y != amdgpu_crtc->cursor_hot_y) {
 		int x, y;
 		int x, y;
 
 
@@ -1955,8 +1953,6 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,
 
 
 		dce_v6_0_cursor_move_locked(crtc, x, y);
 		dce_v6_0_cursor_move_locked(crtc, x, y);
 
 
-		amdgpu_crtc->cursor_width = width;
-		amdgpu_crtc->cursor_height = height;
 		amdgpu_crtc->cursor_hot_x = hot_x;
 		amdgpu_crtc->cursor_hot_x = hot_x;
 		amdgpu_crtc->cursor_hot_y = hot_y;
 		amdgpu_crtc->cursor_hot_y = hot_y;
 	}
 	}

+ 0 - 2
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

@@ -2438,8 +2438,6 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
 
 
 		dce_v8_0_cursor_move_locked(crtc, x, y);
 		dce_v8_0_cursor_move_locked(crtc, x, y);
 
 
-		amdgpu_crtc->cursor_width = width;
-		amdgpu_crtc->cursor_height = height;
 		amdgpu_crtc->cursor_hot_x = hot_x;
 		amdgpu_crtc->cursor_hot_x = hot_x;
 		amdgpu_crtc->cursor_hot_y = hot_y;
 		amdgpu_crtc->cursor_hot_y = hot_y;
 	}
 	}