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/cik_sdma.c | |
| parent | ed5cb43f8f68508c7c025b77bfd6a8aa81cd531e (diff) | |
| download | talos-op-linux-33fa9fe3ddae48c552bce1ab33db0f2f49eb81ea.tar.gz talos-op-linux-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/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 4b2ab769cd99..d629cea865f2 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -771,8 +771,7 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev, 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_SYSTEM) { + if ((flags & R600_PTE_GART_MASK) == R600_PTE_GART_MASK) { uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8; while (count) { unsigned bytes = count * 8; |
