diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-18 11:59:21 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-02-22 19:35:23 -0500 |
commit | 4546b2c1d6e256c716e5240f5d6198a078fd7a22 (patch) | |
tree | 993eb07bfffb479ce6840cd75ab577bd22a98e5a | |
parent | 053688ce03fb3ce0648aac8c604b12552e27fdb0 (diff) |
radeon: move blit functions to radeon_asic.h
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 13 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 9070f556fc9d..15e86b47d7ce 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -1196,19 +1196,6 @@ int radeon_device_init(struct radeon_device *rdev, | |||
1196 | void radeon_device_fini(struct radeon_device *rdev); | 1196 | void radeon_device_fini(struct radeon_device *rdev); |
1197 | int radeon_gpu_wait_for_idle(struct radeon_device *rdev); | 1197 | int radeon_gpu_wait_for_idle(struct radeon_device *rdev); |
1198 | 1198 | ||
1199 | /* r600 blit */ | ||
1200 | int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); | ||
1201 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence); | ||
1202 | void r600_kms_blit_copy(struct radeon_device *rdev, | ||
1203 | u64 src_gpu_addr, u64 dst_gpu_addr, | ||
1204 | int size_bytes); | ||
1205 | /* evergreen blit */ | ||
1206 | int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); | ||
1207 | void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence); | ||
1208 | void evergreen_kms_blit_copy(struct radeon_device *rdev, | ||
1209 | u64 src_gpu_addr, u64 dst_gpu_addr, | ||
1210 | int size_bytes); | ||
1211 | |||
1212 | static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg) | 1199 | static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg) |
1213 | { | 1200 | { |
1214 | if (reg < rdev->rmmio_size) | 1201 | if (reg < rdev->rmmio_size) |
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index eed30ab41804..1c7317e3aa8c 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -363,6 +363,12 @@ void r600_audio_fini(struct radeon_device *rdev); | |||
363 | void r600_hdmi_init(struct drm_encoder *encoder); | 363 | void r600_hdmi_init(struct drm_encoder *encoder); |
364 | int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); | 364 | int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); |
365 | void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); | 365 | void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); |
366 | /* r600 blit */ | ||
367 | int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); | ||
368 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence); | ||
369 | void r600_kms_blit_copy(struct radeon_device *rdev, | ||
370 | u64 src_gpu_addr, u64 dst_gpu_addr, | ||
371 | int size_bytes); | ||
366 | 372 | ||
367 | /* | 373 | /* |
368 | * rv770,rv730,rv710,rv740 | 374 | * rv770,rv730,rv710,rv740 |
@@ -416,5 +422,12 @@ extern void evergreen_post_page_flip(struct radeon_device *rdev, int crtc); | |||
416 | void evergreen_disable_interrupt_state(struct radeon_device *rdev); | 422 | void evergreen_disable_interrupt_state(struct radeon_device *rdev); |
417 | int evergreen_blit_init(struct radeon_device *rdev); | 423 | int evergreen_blit_init(struct radeon_device *rdev); |
418 | void evergreen_blit_fini(struct radeon_device *rdev); | 424 | void evergreen_blit_fini(struct radeon_device *rdev); |
425 | /* evergreen blit */ | ||
426 | int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); | ||
427 | void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence); | ||
428 | void evergreen_kms_blit_copy(struct radeon_device *rdev, | ||
429 | u64 src_gpu_addr, u64 dst_gpu_addr, | ||
430 | int size_bytes); | ||
431 | |||
419 | 432 | ||
420 | #endif | 433 | #endif |