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

Commit a77f1718 authored by Matt Turner's avatar Matt Turner Committed by Dave Airlie
Browse files

drm/radeon/kms: use RADEON_GPU_PAGE_SIZE instead of 4096 



Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent dfdd6467

drivers/gpu/drm/radeon/r100.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@ int r100_wb_init(struct radeon_device *rdev) 
	int r;

	int r;





	if (rdev->wb.wb_obj == NULL) {

	if (rdev->wb.wb_obj == NULL) {

		r = radeon_object_create(rdev, NULL, 4096,

		r = radeon_object_create(rdev, NULL, RADEON_GPU_PAGE_SIZE,

					 true,

					 true,

					 RADEON_GEM_DOMAIN_GTT,

					 RADEON_GEM_DOMAIN_GTT,

					 false, &rdev->wb.wb_obj);

					 false, &rdev->wb.wb_obj);

drivers/gpu/drm/radeon/r300.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev) 
	tmp = RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;

	tmp = RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;

	WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);

	WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);

	WREG32_PCIE(RADEON_PCIE_TX_GART_START_LO, rdev->mc.gtt_location);

	WREG32_PCIE(RADEON_PCIE_TX_GART_START_LO, rdev->mc.gtt_location);

	tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 4096;

	tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - RADEON_GPU_PAGE_SIZE;

	WREG32_PCIE(RADEON_PCIE_TX_GART_END_LO, tmp);

	WREG32_PCIE(RADEON_PCIE_TX_GART_END_LO, tmp);

	WREG32_PCIE(RADEON_PCIE_TX_GART_START_HI, 0);

	WREG32_PCIE(RADEON_PCIE_TX_GART_START_HI, 0);

	WREG32_PCIE(RADEON_PCIE_TX_GART_END_HI, 0);

	WREG32_PCIE(RADEON_PCIE_TX_GART_END_HI, 0);

drivers/gpu/drm/radeon/r600.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1269,9 +1269,9 @@ int r600_cp_resume(struct radeon_device *rdev) 
	rb_bufsz = drm_order(rdev->cp.ring_size / 8);

	rb_bufsz = drm_order(rdev->cp.ring_size / 8);

#ifdef __BIG_ENDIAN

#ifdef __BIG_ENDIAN

	WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE |

	WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE |

		(drm_order(4096/8) << 8) | rb_bufsz);

		(drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz);

#else

#else

	WREG32(CP_RB_CNTL, RB_NO_UPDATE | (drm_order(4096/8) << 8) | rb_bufsz);

	WREG32(CP_RB_CNTL, RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz);

#endif

#endif

	WREG32(CP_SEM_WAIT_TIMER, 0x4);

	WREG32(CP_SEM_WAIT_TIMER, 0x4);
@@ -1400,7 +1400,7 @@ int r600_wb_enable(struct radeon_device *rdev) 
	int r;

	int r;





	if (rdev->wb.wb_obj == NULL) {

	if (rdev->wb.wb_obj == NULL) {

		r = radeon_object_create(rdev, NULL, 4096, true,

		r = radeon_object_create(rdev, NULL, RADEON_GPU_PAGE_SIZE, true,

				RADEON_GEM_DOMAIN_GTT, false, &rdev->wb.wb_obj);

				RADEON_GEM_DOMAIN_GTT, false, &rdev->wb.wb_obj);

		if (r) {

		if (r) {

			dev_warn(rdev->dev, "failed to create WB buffer (%d).\n", r);

			dev_warn(rdev->dev, "failed to create WB buffer (%d).\n", r);
@@ -1450,8 +1450,8 @@ int r600_copy_blit(struct radeon_device *rdev, 
		   uint64_t src_offset, uint64_t dst_offset,

		   uint64_t src_offset, uint64_t dst_offset,

		   unsigned num_pages, struct radeon_fence *fence)

		   unsigned num_pages, struct radeon_fence *fence)

{

{

	r600_blit_prepare_copy(rdev, num_pages * 4096);

	r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE);

	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * 4096);

	r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE);

	r600_blit_done_copy(rdev, fence);

	r600_blit_done_copy(rdev, fence);

	return 0;

	return 0;

}

}

drivers/gpu/drm/radeon/radeon.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -276,6 +276,8 @@ union radeon_gart_table { 
	struct radeon_gart_table_vram	vram;

	struct radeon_gart_table_vram	vram;

};

};





#define RADEON_GPU_PAGE_SIZE 4096



struct radeon_gart {

struct radeon_gart {

	dma_addr_t			table_addr;

	dma_addr_t			table_addr;

	unsigned			num_gpu_pages;

	unsigned			num_gpu_pages;

drivers/gpu/drm/radeon/radeon_benchmark.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize, 
		if (r) {

		if (r) {

			goto out_cleanup;

			goto out_cleanup;

		}

		}

		r = radeon_copy_dma(rdev, saddr, daddr, size / 4096, fence);

		r = radeon_copy_dma(rdev, saddr, daddr, size / RADEON_GPU_PAGE_SIZE, fence);

		if (r) {

		if (r) {

			goto out_cleanup;

			goto out_cleanup;

		}

		}
@@ -88,7 +88,7 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize, 
		if (r) {

		if (r) {

			goto out_cleanup;

			goto out_cleanup;

		}

		}

		r = radeon_copy_blit(rdev, saddr, daddr, size / 4096, fence);

		r = radeon_copy_blit(rdev, saddr, daddr, size / RADEON_GPU_PAGE_SIZE, fence);

		if (r) {

		if (r) {

			goto out_cleanup;

			goto out_cleanup;

		}

		}