diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-04-18 11:32:16 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-04-23 18:03:53 -0400 |
| commit | a973bea11c91bf8283cc13eb17d3ef7086f679d6 (patch) | |
| tree | 8f406b2083834344788d539c0b8c9498c64da544 /drivers/gpu/drm/radeon/radeon.h | |
| parent | b1f6f47e3e33c4a74534f1301aca241ffabbb3a0 (diff) | |
drm/radeon: switch audio handling to use callbacks
Register audio callbacks for asic where we support
audio. Cleans up the code and makes it easier to
add support for newer asics.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 7935370f01af..856a67d5bd9b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
| @@ -1270,6 +1270,9 @@ struct radeon_asic { | |||
| 1270 | void (*set_backlight_level)(struct radeon_encoder *radeon_encoder, u8 level); | 1270 | void (*set_backlight_level)(struct radeon_encoder *radeon_encoder, u8 level); |
| 1271 | /* get backlight level */ | 1271 | /* get backlight level */ |
| 1272 | u8 (*get_backlight_level)(struct radeon_encoder *radeon_encoder); | 1272 | u8 (*get_backlight_level)(struct radeon_encoder *radeon_encoder); |
| 1273 | /* audio callbacks */ | ||
| 1274 | void (*hdmi_enable)(struct drm_encoder *encoder, bool enable); | ||
| 1275 | void (*hdmi_setmode)(struct drm_encoder *encoder, struct drm_display_mode *mode); | ||
| 1273 | } display; | 1276 | } display; |
| 1274 | /* copy functions for bo handling */ | 1277 | /* copy functions for bo handling */ |
| 1275 | struct { | 1278 | struct { |
| @@ -1878,6 +1881,8 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); | |||
| 1878 | #define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->display.get_vblank_counter((rdev), (crtc)) | 1881 | #define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->display.get_vblank_counter((rdev), (crtc)) |
| 1879 | #define radeon_set_backlight_level(rdev, e, l) (rdev)->asic->display.set_backlight_level((e), (l)) | 1882 | #define radeon_set_backlight_level(rdev, e, l) (rdev)->asic->display.set_backlight_level((e), (l)) |
| 1880 | #define radeon_get_backlight_level(rdev, e) (rdev)->asic->display.get_backlight_level((e)) | 1883 | #define radeon_get_backlight_level(rdev, e) (rdev)->asic->display.get_backlight_level((e)) |
| 1884 | #define radeon_hdmi_enable(rdev, e, b) (rdev)->asic->display.hdmi_enable((e), (b)) | ||
| 1885 | #define radeon_hdmi_setmode(rdev, e, m) (rdev)->asic->display.hdmi_setmode((e), (m)) | ||
| 1881 | #define radeon_fence_ring_emit(rdev, r, fence) (rdev)->asic->ring[(r)].emit_fence((rdev), (fence)) | 1886 | #define radeon_fence_ring_emit(rdev, r, fence) (rdev)->asic->ring[(r)].emit_fence((rdev), (fence)) |
| 1882 | #define radeon_semaphore_ring_emit(rdev, r, cp, semaphore, emit_wait) (rdev)->asic->ring[(r)].emit_semaphore((rdev), (cp), (semaphore), (emit_wait)) | 1887 | #define radeon_semaphore_ring_emit(rdev, r, cp, semaphore, emit_wait) (rdev)->asic->ring[(r)].emit_semaphore((rdev), (cp), (semaphore), (emit_wait)) |
| 1883 | #define radeon_copy_blit(rdev, s, d, np, f) (rdev)->asic->copy.blit((rdev), (s), (d), (np), (f)) | 1888 | #define radeon_copy_blit(rdev, s, d, np, f) (rdev)->asic->copy.blit((rdev), (s), (d), (np), (f)) |
| @@ -2013,9 +2018,6 @@ struct radeon_hdmi_acr { | |||
| 2013 | 2018 | ||
| 2014 | extern struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock); | 2019 | extern struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock); |
| 2015 | 2020 | ||
| 2016 | extern void r600_hdmi_enable(struct drm_encoder *encoder); | ||
| 2017 | extern void r600_hdmi_disable(struct drm_encoder *encoder); | ||
| 2018 | extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode); | ||
| 2019 | extern u32 r6xx_remap_render_backend(struct radeon_device *rdev, | 2021 | extern u32 r6xx_remap_render_backend(struct radeon_device *rdev, |
| 2020 | u32 tiling_pipe_num, | 2022 | u32 tiling_pipe_num, |
| 2021 | u32 max_rb_num, | 2023 | u32 max_rb_num, |
| @@ -2026,8 +2028,6 @@ extern u32 r6xx_remap_render_backend(struct radeon_device *rdev, | |||
| 2026 | * evergreen functions used by radeon_encoder.c | 2028 | * evergreen functions used by radeon_encoder.c |
| 2027 | */ | 2029 | */ |
| 2028 | 2030 | ||
| 2029 | extern void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode); | ||
| 2030 | |||
| 2031 | extern int ni_init_microcode(struct radeon_device *rdev); | 2031 | extern int ni_init_microcode(struct radeon_device *rdev); |
| 2032 | extern int ni_mc_load_microcode(struct radeon_device *rdev); | 2032 | extern int ni_mc_load_microcode(struct radeon_device *rdev); |
| 2033 | 2033 | ||