summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-07-21 14:05:35 -0400
committerDave Airlie <airlied@redhat.com>2010-07-22 10:03:55 +1000
commit0baf2d8fe43fdd81faa30e65ff71785c99c78520 (patch)
tree3c174354e13c523c8e549e8ec0fcec7f4f7746c7
parentd667865114d10723f4d22cc5b7bf2c743d1f2198 (diff)
downloadlinux-stable-0baf2d8fe43fdd81faa30e65ff71785c99c78520.tar.gz
linux-stable-0baf2d8fe43fdd81faa30e65ff71785c99c78520.tar.bz2
linux-stable-0baf2d8fe43fdd81faa30e65ff71785c99c78520.zip
drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
Return the crtc_id, not the counter value. They are not necessarily the same. Cc: Jerome Glisse <glisse@freedesktop.org> Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_kms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 6a70c0dc7f92..ab389f89fa8d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -128,7 +128,8 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
for (i = 0, found = 0; i < rdev->num_crtc; i++) {
crtc = (struct drm_crtc *)minfo->crtcs[i];
if (crtc && crtc->base.id == value) {
- value = i;
+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+ value = radeon_crtc->crtc_id;
found = 1;
break;
}