diff options
| author | Flora Cui <Flora.Cui@amd.com> | 2016-12-14 14:36:42 +0800 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-12-19 16:06:15 -0500 | 
| commit | a1f49cc179ce6b7b7758ae3ff5cdb138d0ee0f56 (patch) | |
| tree | cc8bbbcf4b5bdc4df0bc2acadacf338f47ee08fe /drivers/gpu/drm/amd/amdgpu | |
| parent | 8a19e7fa085e22519f2b069406f82ae24d3f3c93 (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 | 
2 files changed, 1 insertions, 7 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index e564442b6393..b4e4ec630e8c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/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); -	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) {  		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); -		amdgpu_crtc->cursor_width = width; -		amdgpu_crtc->cursor_height = height;  		amdgpu_crtc->cursor_hot_x = hot_x;  		amdgpu_crtc->cursor_hot_y = hot_y;  	} diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 6ce7fb42dbef..584abe834a3c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/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); -		amdgpu_crtc->cursor_width = width; -		amdgpu_crtc->cursor_height = height;  		amdgpu_crtc->cursor_hot_x = hot_x;  		amdgpu_crtc->cursor_hot_y = hot_y;  	} | 
