evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon: fix R600_PTE_GART handling

Browse source 
That didn't worked correctly any more and opened up a security problem.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2014-07-22 17:42:20 +02:00 • committed by Alex Deucher
parent ed5cb43f8f
commit 33fa9fe3dd
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/radeon/cik_sdma.c
View file

@ -771,8 +771,7 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev,
trace_radeon_vm_set_page(pe, addr, count, incr, flags); trace_radeon_vm_set_page(pe, addr, count, incr, flags);
/* XXX: How to distinguish between GART and other system memory pages? */ if ((flags & R600_PTE_GART_MASK) == R600_PTE_GART_MASK) {
if (flags & R600_PTE_SYSTEM) {
uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8; uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
while (count) { while (count) {
unsigned bytes = count * 8; unsigned bytes = count * 8;

6
drivers/gpu/drm/radeon/radeon.h
View file

@ -864,9 +864,9 @@ struct radeon_mec {
#define R600_PTE_FRAG_64KB (4 << 7) #define R600_PTE_FRAG_64KB (4 << 7)
#define R600_PTE_FRAG_256KB (6 << 7) #define R600_PTE_FRAG_256KB (6 << 7)
/* flags used for GART page table entries on R600+ */ /* flags needed to be set so we can copy directly from the GART table */
#define R600_PTE_GART ( R600_PTE_VALID | R600_PTE_SYSTEM | R600_PTE_SNOOPED \ #define R600_PTE_GART_MASK ( R600_PTE_READABLE | R600_PTE_WRITEABLE | \
| R600_PTE_READABLE | R600_PTE_WRITEABLE) R600_PTE_SYSTEM | R600_PTE_VALID )
struct radeon_vm_pt { struct radeon_vm_pt {
struct radeon_bo *bo; struct radeon_bo *bo;

3
drivers/gpu/drm/radeon/si_dma.c
View file

@ -79,8 +79,7 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
trace_radeon_vm_set_page(pe, addr, count, incr, flags); trace_radeon_vm_set_page(pe, addr, count, incr, flags);
/* XXX: How to distinguish between GART and other system memory pages? */ if ((flags & R600_PTE_GART_MASK) == R600_PTE_GART_MASK) {
if (flags & R600_PTE_SYSTEM) {
uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8; uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
while (count) { while (count) {
unsigned bytes = count * 8; unsigned bytes = count * 8;