diff options
| author | Christian König <christian.koenig@amd.com> | 2014-07-22 17:42:20 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-05 08:53:37 -0400 |
| commit | 33fa9fe3ddae48c552bce1ab33db0f2f49eb81ea (patch) | |
| tree | ecfdfa5363402fead55ca0c4ef2c7a1195312de4 /drivers/gpu/drm/radeon/radeon.h | |
| parent | ed5cb43f8f68508c7c025b77bfd6a8aa81cd531e (diff) | |
| download | lwn-33fa9fe3ddae48c552bce1ab33db0f2f49eb81ea.tar.gz lwn-33fa9fe3ddae48c552bce1ab33db0f2f49eb81ea.zip | |
drm/radeon: fix R600_PTE_GART handling
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 89b63b9cff5e..fd878c7bb8f0 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -864,9 +864,9 @@ struct radeon_mec { #define R600_PTE_FRAG_64KB (4 << 7) #define R600_PTE_FRAG_256KB (6 << 7) -/* flags used for GART page table entries on R600+ */ -#define R600_PTE_GART ( R600_PTE_VALID | R600_PTE_SYSTEM | R600_PTE_SNOOPED \ - | R600_PTE_READABLE | R600_PTE_WRITEABLE) +/* flags needed to be set so we can copy directly from the GART table */ +#define R600_PTE_GART_MASK ( R600_PTE_READABLE | R600_PTE_WRITEABLE | \ + R600_PTE_SYSTEM | R600_PTE_VALID ) struct radeon_vm_pt { struct radeon_bo *bo; |