diff options
author | Christian König <christian.koenig@amd.com> | 2014-05-27 10:49:20 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-06-02 10:25:11 -0400 |
commit | 157fa14dc4065ce7536473e643c95385d87bd580 (patch) | |
tree | 5b8dc7b22503c1e8009a9a01b39e54b1ece9bf1a /drivers/gpu/drm/radeon/radeon_asic.h | |
parent | 75f36d861957cb05b7889af24c8cd4a789398304 (diff) |
drm/radeon: split page flip and pending callback
Signed-off-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_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 953607d69eb1..0eab015b2cfb 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -135,7 +135,9 @@ extern void r100_pm_prepare(struct radeon_device *rdev); | |||
135 | extern void r100_pm_finish(struct radeon_device *rdev); | 135 | extern void r100_pm_finish(struct radeon_device *rdev); |
136 | extern void r100_pm_init_profile(struct radeon_device *rdev); | 136 | extern void r100_pm_init_profile(struct radeon_device *rdev); |
137 | extern void r100_pm_get_dynpm_state(struct radeon_device *rdev); | 137 | extern void r100_pm_get_dynpm_state(struct radeon_device *rdev); |
138 | extern u32 r100_page_flip(struct radeon_device *rdev, int crtc, u64 crtc_base); | 138 | extern void r100_page_flip(struct radeon_device *rdev, int crtc, |
139 | u64 crtc_base); | ||
140 | extern bool r100_page_flip_pending(struct radeon_device *rdev, int crtc); | ||
139 | extern void r100_wait_for_vblank(struct radeon_device *rdev, int crtc); | 141 | extern void r100_wait_for_vblank(struct radeon_device *rdev, int crtc); |
140 | extern int r100_mc_wait_for_idle(struct radeon_device *rdev); | 142 | extern int r100_mc_wait_for_idle(struct radeon_device *rdev); |
141 | 143 | ||
@@ -239,7 +241,9 @@ void rs600_hpd_set_polarity(struct radeon_device *rdev, | |||
239 | extern void rs600_pm_misc(struct radeon_device *rdev); | 241 | extern void rs600_pm_misc(struct radeon_device *rdev); |
240 | extern void rs600_pm_prepare(struct radeon_device *rdev); | 242 | extern void rs600_pm_prepare(struct radeon_device *rdev); |
241 | extern void rs600_pm_finish(struct radeon_device *rdev); | 243 | extern void rs600_pm_finish(struct radeon_device *rdev); |
242 | extern u32 rs600_page_flip(struct radeon_device *rdev, int crtc, u64 crtc_base); | 244 | extern void rs600_page_flip(struct radeon_device *rdev, int crtc, |
245 | u64 crtc_base); | ||
246 | extern bool rs600_page_flip_pending(struct radeon_device *rdev, int crtc); | ||
243 | void rs600_set_safe_registers(struct radeon_device *rdev); | 247 | void rs600_set_safe_registers(struct radeon_device *rdev); |
244 | extern void avivo_wait_for_vblank(struct radeon_device *rdev, int crtc); | 248 | extern void avivo_wait_for_vblank(struct radeon_device *rdev, int crtc); |
245 | extern int rs600_mc_wait_for_idle(struct radeon_device *rdev); | 249 | extern int rs600_mc_wait_for_idle(struct radeon_device *rdev); |
@@ -448,7 +452,8 @@ void rv770_fini(struct radeon_device *rdev); | |||
448 | int rv770_suspend(struct radeon_device *rdev); | 452 | int rv770_suspend(struct radeon_device *rdev); |
449 | int rv770_resume(struct radeon_device *rdev); | 453 | int rv770_resume(struct radeon_device *rdev); |
450 | void rv770_pm_misc(struct radeon_device *rdev); | 454 | void rv770_pm_misc(struct radeon_device *rdev); |
451 | u32 rv770_page_flip(struct radeon_device *rdev, int crtc, u64 crtc_base); | 455 | void rv770_page_flip(struct radeon_device *rdev, int crtc, u64 crtc_base); |
456 | bool rv770_page_flip_pending(struct radeon_device *rdev, int crtc); | ||
452 | void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); | 457 | void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); |
453 | void r700_cp_stop(struct radeon_device *rdev); | 458 | void r700_cp_stop(struct radeon_device *rdev); |
454 | void r700_cp_fini(struct radeon_device *rdev); | 459 | void r700_cp_fini(struct radeon_device *rdev); |
@@ -516,7 +521,9 @@ extern void sumo_pm_init_profile(struct radeon_device *rdev); | |||
516 | extern void btc_pm_init_profile(struct radeon_device *rdev); | 521 | extern void btc_pm_init_profile(struct radeon_device *rdev); |
517 | int sumo_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); | 522 | int sumo_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); |
518 | int evergreen_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); | 523 | int evergreen_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); |
519 | extern u32 evergreen_page_flip(struct radeon_device *rdev, int crtc, u64 crtc_base); | 524 | extern void evergreen_page_flip(struct radeon_device *rdev, int crtc, |
525 | u64 crtc_base); | ||
526 | extern bool evergreen_page_flip_pending(struct radeon_device *rdev, int crtc); | ||
520 | extern void dce4_wait_for_vblank(struct radeon_device *rdev, int crtc); | 527 | extern void dce4_wait_for_vblank(struct radeon_device *rdev, int crtc); |
521 | void evergreen_disable_interrupt_state(struct radeon_device *rdev); | 528 | void evergreen_disable_interrupt_state(struct radeon_device *rdev); |
522 | int evergreen_mc_wait_for_idle(struct radeon_device *rdev); | 529 | int evergreen_mc_wait_for_idle(struct radeon_device *rdev); |