[PATCH 5/7] radeon: move blit functions to radeon_asic.h

[Alex Deucher]

On Sun, Nov 28, 2010 at 1:06 PM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Reviewed-by: Alex Deucher <alexdeucher at gmail.com>

> ---
>  drivers/gpu/drm/radeon/radeon.h      |   13 -------------
>  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 5fff6bf..942f5f2 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -1182,19 +1182,6 @@ int radeon_device_init(struct radeon_device *rdev,
>  void radeon_device_fini(struct radeon_device *rdev);
>  int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
>
> -/* r600 blit */
> -int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes);
> -void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence);
> -void r600_kms_blit_copy(struct radeon_device *rdev,
> -                       u64 src_gpu_addr, u64 dst_gpu_addr,
> -                       int size_bytes);
> -/* evergreen blit */
> -int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes);
> -void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence);
> -void evergreen_kms_blit_copy(struct radeon_device *rdev,
> -                            u64 src_gpu_addr, u64 dst_gpu_addr,
> -                            int size_bytes);
> -
>  static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
>  {
>        if (reg < rdev->rmmio_size)
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index c7cbba3..8e75be1 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -359,6 +359,12 @@ void r600_audio_fini(struct radeon_device *rdev);
>  void r600_hdmi_init(struct drm_encoder *encoder);
>  int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
>  void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);
> +/* r600 blit */
> +int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes);
> +void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence);
> +void r600_kms_blit_copy(struct radeon_device *rdev,
> +                       u64 src_gpu_addr, u64 dst_gpu_addr,
> +                       int size_bytes);
>
>  /*
>  * rv770,rv730,rv710,rv740
> @@ -411,5 +417,12 @@ void evergreen_post_page_flip(struct radeon_device *rdev, int crtc);
>  void evergreen_disable_interrupt_state(struct radeon_device *rdev);
>  int evergreen_blit_init(struct radeon_device *rdev);
>  void evergreen_blit_fini(struct radeon_device *rdev);
> +/* evergreen blit */
> +int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes);
> +void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence);
> +void evergreen_kms_blit_copy(struct radeon_device *rdev,
> +                            u64 src_gpu_addr, u64 dst_gpu_addr,
> +                            int size_bytes);
> +
>
>  #endif
> --
> 1.7.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>