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

Commit 5159571c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Suspend/resume regression fix for 3.19.

* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Remove rdev->gart.pages_addr array
  drm/radeon: Restore GART table contents after pinning it in VRAM v3
  drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
parents db9098ba 16653dba

drivers/gpu/drm/radeon/cik_sdma.c

+0 −1
Original line number Diff line number Diff line
@@ -816,7 +816,6 @@ void cik_sdma_vm_write_pages(struct radeon_device *rdev, 
		for (; ndw > 0; ndw -= 2, --count, pe += 8) {

			if (flags & R600_PTE_SYSTEM) {

				value = radeon_vm_map_gart(rdev, addr);

				value &= 0xFFFFFFFFFFFFF000ULL;

			} else if (flags & R600_PTE_VALID) {

				value = addr;

			} else {

drivers/gpu/drm/radeon/ni_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ void cayman_dma_vm_write_pages(struct radeon_device *rdev, 
		for (; ndw > 0; ndw -= 2, --count, pe += 8) {

			if (flags & R600_PTE_SYSTEM) {

				value = radeon_vm_map_gart(rdev, addr);

				value &= 0xFFFFFFFFFFFFF000ULL;

			} else if (flags & R600_PTE_VALID) {

				value = addr;

			} else {

drivers/gpu/drm/radeon/r100.c

+8 −2
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ int r100_pci_gart_init(struct radeon_device *rdev) 
		return r;

	rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;

	rdev->asic->gart.tlb_flush = &r100_pci_gart_tlb_flush;

	rdev->asic->gart.get_page_entry = &r100_pci_gart_get_page_entry;

	rdev->asic->gart.set_page = &r100_pci_gart_set_page;

	return radeon_gart_table_ram_alloc(rdev);

}
@@ -681,11 +682,16 @@ void r100_pci_gart_disable(struct radeon_device *rdev) 
	WREG32(RADEON_AIC_HI_ADDR, 0);

}



uint64_t r100_pci_gart_get_page_entry(uint64_t addr, uint32_t flags)

{

	return addr;

}



void r100_pci_gart_set_page(struct radeon_device *rdev, unsigned i,

			    uint64_t addr, uint32_t flags)

			    uint64_t entry)

{

	u32 *gtt = rdev->gart.ptr;

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

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

}



void r100_pci_gart_fini(struct radeon_device *rdev)

drivers/gpu/drm/radeon/r300.c

+11 −5
Original line number Diff line number Diff line
@@ -73,11 +73,8 @@ void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev) 
#define R300_PTE_WRITEABLE (1 << 2)

#define R300_PTE_READABLE  (1 << 3)



void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

			      uint64_t addr, uint32_t flags)

uint64_t rv370_pcie_gart_get_page_entry(uint64_t addr, uint32_t flags)

{

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



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

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

	if (flags & RADEON_GART_PAGE_READ)
@@ -86,10 +83,18 @@ void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i, 
		addr |= R300_PTE_WRITEABLE;

	if (!(flags & RADEON_GART_PAGE_SNOOP))

		addr |= R300_PTE_UNSNOOPED;

	return addr;

}



void rv370_pcie_gart_set_page(struct radeon_device *rdev, unsigned i,

			      uint64_t entry)

{

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



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

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

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

	writel(addr, ((void __iomem *)ptr) + (i * 4));

	writel(entry, ((void __iomem *)ptr) + (i * 4));

}



int rv370_pcie_gart_init(struct radeon_device *rdev)
@@ -109,6 +114,7 @@ int rv370_pcie_gart_init(struct radeon_device *rdev) 
		DRM_ERROR("Failed to register debugfs file for PCIE gart !\n");

	rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;

	rdev->asic->gart.tlb_flush = &rv370_pcie_gart_tlb_flush;

	rdev->asic->gart.get_page_entry = &rv370_pcie_gart_get_page_entry;

	rdev->asic->gart.set_page = &rv370_pcie_gart_set_page;

	return radeon_gart_table_vram_alloc(rdev);

}

drivers/gpu/drm/radeon/radeon.h

+6 −3
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ bool radeon_get_bios(struct radeon_device *rdev); 
 * Dummy page

 */

struct radeon_dummy_page {

	uint64_t	entry;

	struct page	*page;

	dma_addr_t	addr;

};
@@ -645,7 +646,7 @@ struct radeon_gart { 
	unsigned			num_cpu_pages;

	unsigned			table_size;

	struct page			**pages;

	dma_addr_t			*pages_addr;

	uint64_t			*pages_entry;

	bool				ready;

};
@@ -1847,8 +1848,9 @@ struct radeon_asic { 
	/* gart */

	struct {

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

		uint64_t (*get_page_entry)(uint64_t addr, uint32_t flags);

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

				 uint64_t addr, uint32_t flags);

				 uint64_t entry);

	} gart;

	struct {

		int (*init)(struct radeon_device *rdev);
@@ -2852,7 +2854,8 @@ static inline 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_asic_reset(rdev) (rdev)->asic->asic_reset((rdev))

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

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

#define radeon_gart_get_page_entry(a, f) (rdev)->asic->gart.get_page_entry((a), (f))

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

#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_copy_pages(rdev, ib, pe, src, count) ((rdev)->asic->vm.copy_pages((rdev), (ib), (pe), (src), (count)))