Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4546b2c1 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

radeon: move blit functions to radeon_asic.h 



Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 053688ce

drivers/gpu/drm/radeon/radeon.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -1196,19 +1196,6 @@ int radeon_device_init(struct radeon_device *rdev, 
void radeon_device_fini(struct radeon_device *rdev);

void radeon_device_fini(struct radeon_device *rdev);

int radeon_gpu_wait_for_idle(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)

static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)

{

{

	if (reg < rdev->rmmio_size)

	if (reg < rdev->rmmio_size)

drivers/gpu/drm/radeon/radeon_asic.h

+13 −0
Original line number Original line Diff line number Diff line
@@ -363,6 +363,12 @@ void r600_audio_fini(struct radeon_device *rdev); 
void r600_hdmi_init(struct drm_encoder *encoder);

void r600_hdmi_init(struct drm_encoder *encoder);

int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);

int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);

void r600_hdmi_update_audio_settings(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

 * rv770,rv730,rv710,rv740
@@ -416,5 +422,12 @@ extern void evergreen_post_page_flip(struct radeon_device *rdev, int crtc); 
void evergreen_disable_interrupt_state(struct radeon_device *rdev);

void evergreen_disable_interrupt_state(struct radeon_device *rdev);

int evergreen_blit_init(struct radeon_device *rdev);

int evergreen_blit_init(struct radeon_device *rdev);

void evergreen_blit_fini(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
 
#endif