diff options
| author | Ilija Hadzic <ihadzic@research.bell-labs.com> | 2011-05-04 20:15:03 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-09 09:16:05 +1000 |
| commit | 45e5f6a2ee6aac20e393d44f8a6762104426c81b (patch) | |
| tree | fb607aaa76c95ffc1e7b540063f91972844e185c | |
| parent | 2bbd4492552867053b5a618a2474297e2b1c355d (diff) | |
| download | linux-stable-45e5f6a2ee6aac20e393d44f8a6762104426c81b.tar.gz linux-stable-45e5f6a2ee6aac20e393d44f8a6762104426c81b.tar.bz2 linux-stable-45e5f6a2ee6aac20e393d44f8a6762104426c81b.zip | |
drm/radeon: fix order of doing things in radeon_crtc_cursor_set
if object pin or object lookup in radeon_cursor_set fail, the function
could leave inconsistent mouse width and hight values in radeon_crtc
fixed by moving cursor width and height assignments after all
checks have passed
Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index bdf2fa1189ae..3189a7efb2e9 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c @@ -167,9 +167,6 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc, return -EINVAL; } - radeon_crtc->cursor_width = width; - radeon_crtc->cursor_height = height; - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); if (!obj) { DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, radeon_crtc->crtc_id); @@ -180,6 +177,9 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc, if (ret) goto fail; + radeon_crtc->cursor_width = width; + radeon_crtc->cursor_height = height; + radeon_lock_cursor(crtc, true); /* XXX only 27 bit offset for legacy cursor */ radeon_set_cursor(crtc, obj, gpu_addr); |