diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 09:43:56 +0100 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/gpu/drm/radeon/r420.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index c387346f93a..0b59ed7c7d2 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c @@ -96,7 +96,7 @@ void r420_pipes_init(struct radeon_device *rdev) "programming pipes. Bad things might happen.\n"); } /* get max number of pipes */ - gb_pipe_select = RREG32(0x402C); + gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); num_pipes = ((gb_pipe_select >> 12) & 3) + 1; /* SE chips have 1 pipe */ |