On Tue, May 27, 2014 at 10:47 AM, Christian König
<deathsimple@xxxxxxxxxxx> wrote:
> From: Christian König <christian.koenig@xxxxxxx>
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/radeon/radeon.h | 4 ++++
> drivers/gpu/drm/radeon/rs600.c | 9 +--------
> 2 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 325f3a5..7d3e353 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -853,6 +853,10 @@ struct radeon_mec {
> #define R600_PTE_FRAG_64KB (4 << 7)
> #define R600_PTE_FRAG_256KB (6 << 7)
>
> +/* flags used for GART page table entries on R600+ */
> +#define R600_PTE_GART ( R600_PTE_VALID | R600_PTE_SYSTEM | R600_PTE_SNOOPED \
> + | R600_PTE_READABLE | R600_PTE_WRITEABLE)
> +
> struct radeon_vm_pt {
> struct radeon_bo *bo;
> uint64_t addr;
> diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
> index 72d3616..d09620d 100644
> --- a/drivers/gpu/drm/radeon/rs600.c
> +++ b/drivers/gpu/drm/radeon/rs600.c
> @@ -632,12 +632,6 @@ static void rs600_gart_fini(struct radeon_device *rdev)
> radeon_gart_table_vram_free(rdev);
> }
>
> -#define R600_PTE_VALID (1 << 0)
> -#define R600_PTE_SYSTEM (1 << 1)
> -#define R600_PTE_SNOOPED (1 << 2)
> -#define R600_PTE_READABLE (1 << 5)
> -#define R600_PTE_WRITEABLE (1 << 6)
> -
> int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
> {
> void __iomem *ptr = (void *)rdev->gart.ptr;
> @@ -646,8 +640,7 @@ 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;
> + addr |= R600_PTE_GART;
> writeq(addr, ptr + (i * 8));
> return 0;
> }
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
