diff options
author | Jerome Glisse <jglisse@redhat.com> | 2009-09-30 16:18:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-10-01 19:39:23 -0400 |
commit | ac447df4f2283a116a3fbbc28cbaabf05758b736 (patch) | |
tree | 5fdf4749560edb366e369bcfa43b5196831adfae /drivers/gpu/drm/radeon/rs690.c | |
parent | e7d40b9a0a7c857383ef50db9766354bd3be1bf3 (diff) |
drm/radeon/kms: Fix irq handling on AVIVO hw
Avivo hw have vblank interrupt in different place, fixes
irq handling (especialy irq disabling while suspending or
shuting down the module).
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs690.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs690.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index c3cd2f689ef..025e3225346 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c | |||
@@ -606,7 +606,7 @@ static int rs690_startup(struct radeon_device *rdev) | |||
606 | return r; | 606 | return r; |
607 | /* Enable IRQ */ | 607 | /* Enable IRQ */ |
608 | rdev->irq.sw_int = true; | 608 | rdev->irq.sw_int = true; |
609 | r100_irq_set(rdev); | 609 | rs600_irq_set(rdev); |
610 | /* 1M ring buffer */ | 610 | /* 1M ring buffer */ |
611 | r = r100_cp_init(rdev, 1024 * 1024); | 611 | r = r100_cp_init(rdev, 1024 * 1024); |
612 | if (r) { | 612 | if (r) { |
@@ -647,7 +647,7 @@ int rs690_suspend(struct radeon_device *rdev) | |||
647 | { | 647 | { |
648 | r100_cp_disable(rdev); | 648 | r100_cp_disable(rdev); |
649 | r100_wb_disable(rdev); | 649 | r100_wb_disable(rdev); |
650 | r100_irq_disable(rdev); | 650 | rs600_irq_disable(rdev); |
651 | rs400_gart_disable(rdev); | 651 | rs400_gart_disable(rdev); |
652 | return 0; | 652 | return 0; |
653 | } | 653 | } |