aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon.h
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-01-15 08:44:37 -0500
committerDave Airlie <airlied@linux.ie>2010-01-20 17:42:59 -0500
commit0c45249f419d8b86abe0e51c6627ca4b085e8c23 (patch)
treebb50e5f91fbb7c2db683a3d1e84965dc83612acc /drivers/gpu/drm/radeon/radeon.h
parent615e0cb67968c94fd9e53797985843a5b816dec4 (diff)
drm/radeon/kms: r600/r700 disable irq at suspend
To avoid hw doing anythings after we disabled PCIE GART, fully disable IRQ at suspend. Also cleanup a bit the ih structure and process function. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c23278240a4e..09c655f3843b 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -410,7 +410,6 @@ struct r600_ih {
410 unsigned wptr_old; 410 unsigned wptr_old;
411 unsigned ring_size; 411 unsigned ring_size;
412 uint64_t gpu_addr; 412 uint64_t gpu_addr;
413 uint32_t align_mask;
414 uint32_t ptr_mask; 413 uint32_t ptr_mask;
415 spinlock_t lock; 414 spinlock_t lock;
416 bool enabled; 415 bool enabled;
@@ -1162,7 +1161,8 @@ extern int r600_irq_init(struct radeon_device *rdev);
1162extern void r600_irq_fini(struct radeon_device *rdev); 1161extern void r600_irq_fini(struct radeon_device *rdev);
1163extern void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size); 1162extern void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size);
1164extern int r600_irq_set(struct radeon_device *rdev); 1163extern int r600_irq_set(struct radeon_device *rdev);
1165 1164extern void r600_irq_suspend(struct radeon_device *rdev);
1165/* r600 audio */
1166extern int r600_audio_init(struct radeon_device *rdev); 1166extern int r600_audio_init(struct radeon_device *rdev);
1167extern int r600_audio_tmds_index(struct drm_encoder *encoder); 1167extern int r600_audio_tmds_index(struct drm_encoder *encoder);
1168extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock); 1168extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock);