aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-01 01:22:38 -0500
committerDave Airlie <airlied@redhat.com>2010-03-01 01:22:38 -0500
commit1c62233508ef7104f8a78e571fdf5c72d0dc0200 (patch)
tree31e19cbff5c1080d3015d20b24dd43ee95f4ed8c /drivers/gpu/drm/radeon/radeon.h
parent6d9c13513661c1991bf5f4e6e1363c721292d819 (diff)
parent6a9ee8af344e3bd7dbd61e67037096cdf7f83289 (diff)
Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
* 'gpu-switcher' of /ssd/git//linux-2.6: vga_switcheroo: initial implementation (v15) fb: for framebuffer handover don't exit the loop early. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/radeon/Makefile drivers/gpu/drm/radeon/radeon.h
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 2434d553bbb..ad9d55f9439 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -119,6 +119,10 @@ struct radeon_device;
119/* 119/*
120 * BIOS. 120 * BIOS.
121 */ 121 */
122#define ATRM_BIOS_PAGE 4096
123
124bool radeon_atrm_supported(struct pci_dev *pdev);
125int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len);
122bool radeon_get_bios(struct radeon_device *rdev); 126bool radeon_get_bios(struct radeon_device *rdev);
123 127
124 128
@@ -957,6 +961,8 @@ struct radeon_device {
957 int audio_bits_per_sample; 961 int audio_bits_per_sample;
958 uint8_t audio_status_bits; 962 uint8_t audio_status_bits;
959 uint8_t audio_category_code; 963 uint8_t audio_category_code;
964
965 bool powered_down;
960}; 966};
961 967
962int radeon_device_init(struct radeon_device *rdev, 968int radeon_device_init(struct radeon_device *rdev,
@@ -1167,6 +1173,8 @@ extern void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain);
1167extern bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo); 1173extern bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo);
1168extern void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 base); 1174extern void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 base);
1169extern void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); 1175extern void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);
1176extern int radeon_resume_kms(struct drm_device *dev);
1177extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state);
1170 1178
1171/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ 1179/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
1172struct r100_mc_save { 1180struct r100_mc_save {