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

Commit 77497f27 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/radeon: Pass GART page flags to radeon_gart_set_page() explicitly 



Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a3eb06db

drivers/gpu/drm/radeon/r100.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -682,7 +682,7 @@ void r100_pci_gart_disable(struct radeon_device *rdev) 
}

}





void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i,

void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i,

			    uint64_t addr)

			    uint64_t addr, uint32_t flags)

{

{

	u32 *gtt = rdev->gart.ptr;

	u32 *gtt = rdev->gart.ptr;

	gtt[i] = cpu_to_le32(lower_32_bits(addr));

	gtt[i] = cpu_to_le32(lower_32_bits(addr));

drivers/gpu/drm/radeon/r300.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -69,17 +69,23 @@ void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev) 
	mb();

	mb();

}

}





#define R300_PTE_UNSNOOPED (1 << 0)

#define R300_PTE_WRITEABLE (1 << 2)

#define R300_PTE_WRITEABLE (1 << 2)

#define R300_PTE_READABLE  (1 << 3)

#define R300_PTE_READABLE  (1 << 3)





void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

			      uint64_t addr)

			      uint64_t addr, uint32_t flags)

{

{

	void __iomem *ptr = rdev->gart.ptr;

	void __iomem *ptr = rdev->gart.ptr;





	addr = (lower_32_bits(addr) >> 8) |

	addr = (lower_32_bits(addr) >> 8) |

	       ((upper_32_bits(addr) & 0xff) << 24) |

		((upper_32_bits(addr) & 0xff) << 24);

	       R300_PTE_WRITEABLE | R300_PTE_READABLE;

	if (flags & RADEON_GART_PAGE_READ)

		addr |= R300_PTE_READABLE;

	if (flags & RADEON_GART_PAGE_WRITE)

		addr |= R300_PTE_WRITEABLE;

	if (!(flags & RADEON_GART_PAGE_SNOOP))

		addr |= R300_PTE_UNSNOOPED;

	/* on x86 we want this to be CPU endian, on powerpc

	/* on x86 we want this to be CPU endian, on powerpc

	 * on powerpc without HW swappers, it'll get swapped on way

	 * on powerpc without HW swappers, it'll get swapped on way

	 * into VRAM - so no need for cpu_to_le32 on VRAM tables */

	 * into VRAM - so no need for cpu_to_le32 on VRAM tables */

drivers/gpu/drm/radeon/radeon.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -593,6 +593,12 @@ struct radeon_mc; 
#define RADEON_GPU_PAGE_SHIFT 12

#define RADEON_GPU_PAGE_SHIFT 12

#define RADEON_GPU_PAGE_ALIGN(a) (((a) + RADEON_GPU_PAGE_MASK) & ~RADEON_GPU_PAGE_MASK)

#define RADEON_GPU_PAGE_ALIGN(a) (((a) + RADEON_GPU_PAGE_MASK) & ~RADEON_GPU_PAGE_MASK)





#define RADEON_GART_PAGE_DUMMY  0

#define RADEON_GART_PAGE_VALID	(1 << 0)

#define RADEON_GART_PAGE_READ	(1 << 1)

#define RADEON_GART_PAGE_WRITE	(1 << 2)

#define RADEON_GART_PAGE_SNOOP	(1 << 3)



struct radeon_gart {

struct radeon_gart {

	dma_addr_t			table_addr;

	dma_addr_t			table_addr;

	struct radeon_bo		*robj;

	struct radeon_bo		*robj;
@@ -617,7 +623,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, 
			int pages);

			int pages);

int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,

int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,

		     int pages, struct page **pagelist,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr);

		     dma_addr_t *dma_addr, uint32_t flags);









/*

/*
@@ -1784,7 +1790,7 @@ struct radeon_asic { 
	struct {

	struct {

		void (*tlb_flush)(struct radeon_device *rdev);

		void (*tlb_flush)(struct radeon_device *rdev);

		void (*set_page)(struct radeon_device *rdev, unsigned i,

		void (*set_page)(struct radeon_device *rdev, unsigned i,

				 uint64_t addr);

				 uint64_t addr, uint32_t flags);

	} gart;

	} gart;

	struct {

	struct {

		int (*init)(struct radeon_device *rdev);

		int (*init)(struct radeon_device *rdev);
@@ -2745,7 +2751,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); 
#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))

#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))

#define radeon_asic_reset(rdev) (rdev)->asic->asic_reset((rdev))

#define radeon_asic_reset(rdev) (rdev)->asic->asic_reset((rdev))

#define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart.tlb_flush((rdev))

#define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart.tlb_flush((rdev))

#define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart.set_page((rdev), (i), (p))

#define radeon_gart_set_page(rdev, i, p, f) (rdev)->asic->gart.set_page((rdev), (i), (p), (f))

#define radeon_asic_vm_init(rdev) (rdev)->asic->vm.init((rdev))

#define radeon_asic_vm_init(rdev) (rdev)->asic->vm.init((rdev))

#define radeon_asic_vm_fini(rdev) (rdev)->asic->vm.fini((rdev))

#define radeon_asic_vm_fini(rdev) (rdev)->asic->vm.fini((rdev))

#define radeon_asic_vm_set_page(rdev, ib, pe, addr, count, incr, flags) ((rdev)->asic->vm.set_page((rdev), (ib), (pe), (addr), (count), (incr), (flags)))

#define radeon_asic_vm_set_page(rdev, ib, pe, addr, count, incr, flags) ((rdev)->asic->vm.set_page((rdev), (ib), (pe), (addr), (count), (incr), (flags)))

drivers/gpu/drm/radeon/radeon_asic.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ int r100_asic_reset(struct radeon_device *rdev); 
u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);

u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);

void r100_pci_gart_tlb_flush(struct radeon_device *rdev);

void r100_pci_gart_tlb_flush(struct radeon_device *rdev);

void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i,

void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i,

			    uint64_t addr);

			    uint64_t addr, uint32_t flags);

void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring);

void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring);

int r100_irq_set(struct radeon_device *rdev);

int r100_irq_set(struct radeon_device *rdev);

int r100_irq_process(struct radeon_device *rdev);

int r100_irq_process(struct radeon_device *rdev);
@@ -173,7 +173,7 @@ extern void r300_fence_ring_emit(struct radeon_device *rdev, 
extern int r300_cs_parse(struct radeon_cs_parser *p);

extern int r300_cs_parse(struct radeon_cs_parser *p);

extern void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev);

extern void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev);

extern void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

extern void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

				     uint64_t addr);

				     uint64_t addr, uint32_t flags);

extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes);

extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes);

extern int rv370_get_pcie_lanes(struct radeon_device *rdev);

extern int rv370_get_pcie_lanes(struct radeon_device *rdev);

extern void r300_set_reg_safe(struct radeon_device *rdev);

extern void r300_set_reg_safe(struct radeon_device *rdev);
@@ -209,7 +209,7 @@ extern int rs400_suspend(struct radeon_device *rdev); 
extern int rs400_resume(struct radeon_device *rdev);

extern int rs400_resume(struct radeon_device *rdev);

void rs400_gart_tlb_flush(struct radeon_device *rdev);

void rs400_gart_tlb_flush(struct radeon_device *rdev);

void rs400_gart_set_page(struct radeon_device *rdev, unsigned i,

void rs400_gart_set_page(struct radeon_device *rdev, unsigned i,

			 uint64_t addr);

			 uint64_t addr, uint32_t flags);

uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg);

uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg);

void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);

void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);

int rs400_gart_init(struct radeon_device *rdev);

int rs400_gart_init(struct radeon_device *rdev);
@@ -233,7 +233,7 @@ void rs600_irq_disable(struct radeon_device *rdev); 
u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc);

u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc);

void rs600_gart_tlb_flush(struct radeon_device *rdev);

void rs600_gart_tlb_flush(struct radeon_device *rdev);

void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,

void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,

			 uint64_t addr);

			 uint64_t addr, uint32_t flags);

uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg);

uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg);

void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);

void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);

void rs600_bandwidth_update(struct radeon_device *rdev);

void rs600_bandwidth_update(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_gart.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -243,7 +243,8 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, 
			page_base = rdev->gart.pages_addr[p];

			page_base = rdev->gart.pages_addr[p];

			for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {

			for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {

				if (rdev->gart.ptr) {

				if (rdev->gart.ptr) {

					radeon_gart_set_page(rdev, t, page_base);

					radeon_gart_set_page(rdev, t, page_base,

							     RADEON_GART_PAGE_DUMMY);

				}

				}

				page_base += RADEON_GPU_PAGE_SIZE;

				page_base += RADEON_GPU_PAGE_SIZE;

			}

			}
@@ -261,13 +262,15 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, 
 * @pages: number of pages to bind

 * @pages: number of pages to bind

 * @pagelist: pages to bind

 * @pagelist: pages to bind

 * @dma_addr: DMA addresses of pages

 * @dma_addr: DMA addresses of pages

 * @flags: RADEON_GART_PAGE_* flags

 *

 *

 * Binds the requested pages to the gart page table

 * Binds the requested pages to the gart page table

 * (all asics).

 * (all asics).

 * Returns 0 for success, -EINVAL for failure.

 * Returns 0 for success, -EINVAL for failure.

 */

 */

int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,

int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,

		     int pages, struct page **pagelist, dma_addr_t *dma_addr)

		     int pages, struct page **pagelist, dma_addr_t *dma_addr,

		     uint32_t flags)

{

{

	unsigned t;

	unsigned t;

	unsigned p;

	unsigned p;
@@ -287,7 +290,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset, 
		if (rdev->gart.ptr) {

		if (rdev->gart.ptr) {

			page_base = rdev->gart.pages_addr[p];

			page_base = rdev->gart.pages_addr[p];

			for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {

			for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {

				radeon_gart_set_page(rdev, t, page_base);

				radeon_gart_set_page(rdev, t, page_base, flags);

				page_base += RADEON_GPU_PAGE_SIZE;

				page_base += RADEON_GPU_PAGE_SIZE;

			}

			}

		}

		}