diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-06-27 17:54:10 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-06-27 17:54:10 -0400 |
| commit | eaab602d4091028c336788f12784a5dcd900afe4 (patch) | |
| tree | c4f31029d8ba5eff1d928f597ccc551cf5bc135e /drivers/gpu/drm/radeon/rs600.c | |
| parent | d2058ea36971326fdc0ef1880f3eb17af9b80a2c (diff) | |
| parent | be47c9e70ec3e4687531f29e3d290ef4f9b5ed35 (diff) | |
Merge tag 'v3.4.49' into v3.4-rt
This is the 3.4.49 stable release
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index d25cf869d08d..52480010156d 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -864,6 +864,12 @@ static int rs600_startup(struct radeon_device *rdev) } /* Enable IRQ */ + if (!rdev->irq.installed) { + r = radeon_irq_kms_init(rdev); + if (r) + return r; + } + rs600_irq_set(rdev); rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); /* 1M ring buffer */ @@ -994,9 +1000,6 @@ int rs600_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) |