diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 11:59:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 11:59:39 -0400 |
| commit | 3546eea837bffb21f98c8e8529d3de3893fce651 (patch) | |
| tree | 415623b6bf0853614fabf74a325c7200e3056a36 /drivers/gpu/drm/radeon/ni.c | |
| parent | f1bb20a8365f6753e0f7b6e94981ca2b662bae13 (diff) | |
| parent | d61a06862ba8c14466e1dd718cac460da0465ddd (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/kms: allow drm_mode_group with no objects
drm/radeon/kms: free ib pool on module unloading
drm/radeon/kms: fix typo in evergreen disp int status register
drm/radeon/kms: fix typo in IH_CNTL swap bitfield
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 16caafeadf5e..559dbd412906 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
| @@ -1581,6 +1581,7 @@ void cayman_fini(struct radeon_device *rdev) | |||
| 1581 | cayman_cp_fini(rdev); | 1581 | cayman_cp_fini(rdev); |
| 1582 | r600_irq_fini(rdev); | 1582 | r600_irq_fini(rdev); |
| 1583 | radeon_wb_fini(rdev); | 1583 | radeon_wb_fini(rdev); |
| 1584 | radeon_ib_pool_fini(rdev); | ||
| 1584 | radeon_irq_kms_fini(rdev); | 1585 | radeon_irq_kms_fini(rdev); |
| 1585 | cayman_pcie_gart_fini(rdev); | 1586 | cayman_pcie_gart_fini(rdev); |
| 1586 | radeon_gem_fini(rdev); | 1587 | radeon_gem_fini(rdev); |