diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-05 14:33:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-05 14:33:26 +1000 |
| commit | ec7fdeee19474afb2169bb0939cbc972f9aa20eb (patch) | |
| tree | cb8fcab2fe1e3889c4a0f45c5eae9dd27e64fd15 /drivers/gpu/drm/radeon/r100.c | |
| parent | 91f8f105f2b82b4a38dee2d74760bc39d40ec42c (diff) | |
| parent | 1cbcca302a318499f20a512847c5d6a510c08c35 (diff) | |
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Alex writes:
Just a few fixes for radeon. The big one is a fix for hangs on older
asics due to the ordering of interrupt initialization.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: don't allow audio on DCE6
drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)
radeon: Fix system hang issue when using KMS with older cards
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 4973bff37fec..d0314ecbd7c1 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -3869,6 +3869,12 @@ static int r100_startup(struct radeon_device *rdev) } /* Enable IRQ */ + if (!rdev->irq.installed) { + r = radeon_irq_kms_init(rdev); + if (r) + return r; + } + r100_irq_set(rdev); rdev->config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); /* 1M ring buffer */ @@ -4024,9 +4030,6 @@ int r100_init(struct radeon_device *rdev) r = radeon_fence_driver_init(rdev); if (r) return r; - r = radeon_irq_kms_init(rdev); - if (r) - return r; /* Memory manager */ r = radeon_bo_init(rdev); if (r) |