diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-07 22:29:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-07 22:29:53 -0500 |
| commit | e8d6d61586b84acfd66ec20142c9a850d2d11544 (patch) | |
| tree | 14d30092322a36772337bafa76c84b5ddb2d8c98 /drivers/gpu/drm/radeon/rv515.c | |
| parent | a3a06cb6c207a5612fa9753e2453bbcb3f5a256d (diff) | |
| parent | 003e69f9862bcda89a75c27750efdbc17ac02945 (diff) | |
Merge remote branch 'korg/drm-radeon-testing' into drm-testing
Diffstat (limited to 'drivers/gpu/drm/radeon/rv515.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv515.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 59632a506b46..62756717b044 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c | |||
| @@ -479,6 +479,7 @@ static int rv515_startup(struct radeon_device *rdev) | |||
| 479 | } | 479 | } |
| 480 | /* Enable IRQ */ | 480 | /* Enable IRQ */ |
| 481 | rs600_irq_set(rdev); | 481 | rs600_irq_set(rdev); |
| 482 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); | ||
| 482 | /* 1M ring buffer */ | 483 | /* 1M ring buffer */ |
| 483 | r = r100_cp_init(rdev, 1024 * 1024); | 484 | r = r100_cp_init(rdev, 1024 * 1024); |
| 484 | if (r) { | 485 | if (r) { |