Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92a32a47 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents b1fb0124 226b6d88

drivers/gpu/drm/radeon/rs400.c

+2 −2
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ void rs400_gart_set_page(struct radeon_device *rdev, unsigned i, 
	entry = (lower_32_bits(addr) & PAGE_MASK) |

		((upper_32_bits(addr) & 0xff) << 4);

	if (flags & RADEON_GART_PAGE_READ)

		addr |= RS400_PTE_READABLE;

		entry |= RS400_PTE_READABLE;

	if (flags & RADEON_GART_PAGE_WRITE)

		addr |= RS400_PTE_WRITEABLE;

		entry |= RS400_PTE_WRITEABLE;

	if (!(flags & RADEON_GART_PAGE_SNOOP))

		entry |= RS400_PTE_UNSNOOPED;

	entry = cpu_to_le32(entry);