| Message ID | 1411089766-1803-1-git-send-email-michel@daenzer.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 18, 2014 at 9:22 PM, Michel Dänzer <michel@daenzer.net> wrote: > From: Michel Dänzer <michel.daenzer@amd.com> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83996 > Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Added to my -fixes tree. Alex > --- > drivers/gpu/drm/radeon/rs400.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c > index 6c1fc33..c5799f16 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, > 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); > -- > 2.1.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 6c1fc33..c5799f16 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, 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);