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

Commit 82568565 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/kms: set gart pages to invalid on unbind and point to dummy page 



this uses a new entrypoint to invalidate gart entries instead of using 0.
Changed to rather than pointing to 0 address point empty entry to dummy
page. This might help to avoid hard lockup if for some wrong
reasons GPU try to access unmapped GART entry.

I'm not 100% sure this is going to work, we probably need to allocate
a dummy page and point all the GTT entries at it similiar to what AGP does.
but we can test this first I suppose.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e3439895

drivers/gpu/drm/radeon/evergreen.c

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev) 
	r = radeon_gart_table_vram_pin(rdev);

	if (r)

		return r;

	radeon_gart_restore(rdev);

	/* Setup L2 cache */

	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |

				ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE |

drivers/gpu/drm/radeon/r100.c

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ int r100_pci_gart_enable(struct radeon_device *rdev) 
{

	uint32_t tmp;



	radeon_gart_restore(rdev);

	/* discard memory request outside of configured range */

	tmp = RREG32(RADEON_AIC_CNTL) | RADEON_DIS_OUT_OF_PCI_GART_ACCESS;

	WREG32(RADEON_AIC_CNTL, tmp);

drivers/gpu/drm/radeon/r300.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev) 
	r = radeon_gart_table_vram_pin(rdev);

	if (r)

		return r;

	radeon_gart_restore(rdev);

	/* discard memory request outside of configured range */

	tmp = RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;

	WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);

drivers/gpu/drm/radeon/r600.c

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ int r600_pcie_gart_enable(struct radeon_device *rdev) 
	r = radeon_gart_table_vram_pin(rdev);

	if (r)

		return r;

	radeon_gart_restore(rdev);



	/* Setup L2 cache */

	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -1145,6 +1145,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) 
/* AGP */

extern void radeon_agp_disable(struct radeon_device *rdev);

extern int radeon_gart_table_vram_pin(struct radeon_device *rdev);

extern void radeon_gart_restore(struct radeon_device *rdev);

extern int radeon_modeset_init(struct radeon_device *rdev);

extern void radeon_modeset_fini(struct radeon_device *rdev);

extern bool radeon_card_posted(struct radeon_device *rdev);
@@ -1269,7 +1270,6 @@ extern void r600_ring_init(struct radeon_device *rdev, unsigned ring_size); 
extern int r600_cp_resume(struct radeon_device *rdev);

extern void r600_cp_fini(struct radeon_device *rdev);

extern int r600_count_pipe_bits(uint32_t val);

extern int r600_gart_clear_page(struct radeon_device *rdev, int i);

extern int r600_mc_wait_for_idle(struct radeon_device *rdev);

extern int r600_pcie_gart_init(struct radeon_device *rdev);

extern void r600_pcie_gart_tlb_flush(struct radeon_device *rdev);