From 4d7deeb4bb15acfa041b6d9b2664d953412979d5 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 8 Oct 2009 11:32:49 +1000 Subject: [PATCH] --- yaml --- r: 167055 b: refs/heads/master c: d4ac6a05d51357e31028cc9076874a58dd197b83 h: refs/heads/master i: 167053: cd0dc4856b91684f4d0bc9e30ca85905f04ed154 167051: 2f9c4a251e4302a2be31a3885231a17e2287d22c 167047: 9cc5c0bdf4f67cd8cae310633a2d0b17a8eb38f0 167039: 114e73836925bf884a1b74cc678ccbf0dc1598e9 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r100.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ac2ce8bbcb0..a082bc0affe6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49c458e544ae14514209ed80ea6829ca1b18ddf0 +refs/heads/master: d4ac6a05d51357e31028cc9076874a58dd197b83 diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c index 5fe12c02d2dd..374ecacc6183 100644 --- a/trunk/drivers/gpu/drm/radeon/r100.c +++ b/trunk/drivers/gpu/drm/radeon/r100.c @@ -829,7 +829,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) header = radeon_get_ib_value(p, h_idx); crtc_id = radeon_get_ib_value(p, h_idx + 5); - reg = header >> 2; + reg = CP_PACKET0_GET_REG(header); mutex_lock(&p->rdev->ddev->mode_config.mutex); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); if (!obj) { diff --git a/trunk/drivers/gpu/drm/radeon/r600_cs.c b/trunk/drivers/gpu/drm/radeon/r600_cs.c index d28970db6a2d..17e42195c632 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_cs.c +++ b/trunk/drivers/gpu/drm/radeon/r600_cs.c @@ -252,7 +252,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p) header = radeon_get_ib_value(p, h_idx); crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1); - reg = header >> 2; + reg = CP_PACKET0_GET_REG(header); mutex_lock(&p->rdev->ddev->mode_config.mutex); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); if (!obj) {