diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-28 20:03:33 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-28 20:03:33 -0400 |
| commit | 6bd054e81a9179feef5c48b60f9467aa3498cefa (patch) | |
| tree | 5826adf9bed0b6a0e071027d5ec9fa59790ab1db /drivers/gpu/drm/radeon/rs600.c | |
| parent | 708fb1edb00a084721ce8485179a84416cccd777 (diff) | |
| parent | 0758142f8a850928b886978753b1d8c473d6eee2 (diff) | |
Merge tag 'v3.4.99' into v3.4-rt
This is the 3.4.99 stable release
Conflicts:
kernel/rtmutex.c
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 52480010156d..739eb0d0d12d 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -539,8 +539,10 @@ int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) return -EINVAL; } addr = addr & 0xFFFFFFFFFFFFF000ULL; - addr |= R600_PTE_VALID | R600_PTE_SYSTEM | R600_PTE_SNOOPED; - addr |= R600_PTE_READABLE | R600_PTE_WRITEABLE; + if (addr != rdev->dummy_page.addr) + addr |= R600_PTE_VALID | R600_PTE_READABLE | + R600_PTE_WRITEABLE; + addr |= R600_PTE_SYSTEM | R600_PTE_SNOOPED; writeq(addr, ptr + (i * 8)); return 0; } |