diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-20 03:23:37 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-20 03:23:37 -0400 |
| commit | 92a32a4722b7c85377775f5ae987c7ae0c4ed67e (patch) | |
| tree | e6695cad73abc44fbefb54d7cff2c54fa386e6e2 | |
| parent | b1fb01241b515641e11263fcc628242d9aeb56ff (diff) | |
| parent | 226b6d88d0c38bd0817660c79e3bea870dfeee4b (diff) | |
Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
single fix for regression on rs4xx/rs690/rs740
* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
| -rw-r--r-- | drivers/gpu/drm/radeon/rs400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 6c1fc339d228..c5799f16aa4b 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c | |||
| @@ -221,9 +221,9 @@ void rs400_gart_set_page(struct radeon_device *rdev, unsigned i, | |||
| 221 | entry = (lower_32_bits(addr) & PAGE_MASK) | | 221 | entry = (lower_32_bits(addr) & PAGE_MASK) | |
| 222 | ((upper_32_bits(addr) & 0xff) << 4); | 222 | ((upper_32_bits(addr) & 0xff) << 4); |
| 223 | if (flags & RADEON_GART_PAGE_READ) | 223 | if (flags & RADEON_GART_PAGE_READ) |
| 224 | addr |= RS400_PTE_READABLE; | 224 | entry |= RS400_PTE_READABLE; |
| 225 | if (flags & RADEON_GART_PAGE_WRITE) | 225 | if (flags & RADEON_GART_PAGE_WRITE) |
| 226 | addr |= RS400_PTE_WRITEABLE; | 226 | entry |= RS400_PTE_WRITEABLE; |
| 227 | if (!(flags & RADEON_GART_PAGE_SNOOP)) | 227 | if (!(flags & RADEON_GART_PAGE_SNOOP)) |
| 228 | entry |= RS400_PTE_UNSNOOPED; | 228 | entry |= RS400_PTE_UNSNOOPED; |
| 229 | entry = cpu_to_le32(entry); | 229 | entry = cpu_to_le32(entry); |