All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT
@ 2014-05-27 14:47 Christian König
  2014-05-27 14:47 ` [PATCH 2/3] drm/radeon: optimize SI VM handling Christian König
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Christian König @ 2014-05-27 14:47 UTC (permalink / raw)
  To: dri-devel

From: Christian König <christian.koenig@amd.com>

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/3] drm/radeon: optimize SI VM handling
  2014-05-27 14:47 [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Christian König
@ 2014-05-27 14:47 ` Christian König
  2014-05-27 15:45   ` Alex Deucher
  2014-05-27 14:47 ` [PATCH 3/3] drm/radeon: optimize CIK " Christian König
  2014-05-27 15:44 ` [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Alex Deucher
  2 siblings, 1 reply; 8+ messages in thread
From: Christian König @ 2014-05-27 14:47 UTC (permalink / raw)
  To: dri-devel

From: Christian König <christian.koenig@amd.com>

Fill VM page tables from the GART page table if applicable.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/radeon/si_dma.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c
index cf0fdad..9521669 100644
--- a/drivers/gpu/drm/radeon/si_dma.c
+++ b/drivers/gpu/drm/radeon/si_dma.c
@@ -79,7 +79,25 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
 
 	trace_radeon_vm_set_page(pe, addr, count, incr, flags);
 
-	if (flags & R600_PTE_SYSTEM) {
+	if (flags == R600_PTE_GART) {
+		uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
+		while (count) {
+			unsigned bytes = count * 8;
+			if (bytes > 0xFFFF8)
+				bytes = 0xFFFF8;
+
+			ib->ptr[ib->length_dw++] = DMA_PACKET(DMA_PACKET_COPY,
+							      1, 0, 0, bytes);
+			ib->ptr[ib->length_dw++] = pe & 0xffffffff;
+			ib->ptr[ib->length_dw++] = src & 0xffffffff;
+			ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
+			ib->ptr[ib->length_dw++] = upper_32_bits(src) & 0xff;
+
+			pe += bytes;
+			src += bytes;
+			count -= bytes / 8;
+		}
+	} else if (flags & R600_PTE_SYSTEM) {
 		while (count) {
 			ndw = count * 2;
 			if (ndw > 0xFFFFE)
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/3] drm/radeon: optimize CIK VM handling
  2014-05-27 14:47 [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Christian König
  2014-05-27 14:47 ` [PATCH 2/3] drm/radeon: optimize SI VM handling Christian König
@ 2014-05-27 14:47 ` Christian König
  2014-05-27 15:44   ` Alex Deucher
  2014-05-27 15:44 ` [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Alex Deucher
  2 siblings, 1 reply; 8+ messages in thread
From: Christian König @ 2014-05-27 14:47 UTC (permalink / raw)
  To: dri-devel

From: Christian König <christian.koenig@amd.com>

Fill VM page tables from the GART page table if applicable.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/radeon/cik_sdma.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index f7e46cf..5bd3fe8 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev,
 
 	trace_radeon_vm_set_page(pe, addr, count, incr, flags);
 
-	if (flags & R600_PTE_SYSTEM) {
+	if (flags == R600_PTE_GART) {
+		uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
+		while (count) {
+			unsigned bytes = count * 8;
+			if (bytes > 0x1FFFF8)
+				bytes = 0x1FFFF8;
+
+			ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
+			ib->ptr[ib->length_dw++] = bytes;
+			ib->ptr[ib->length_dw++] = 0; /* src/dst endian swap */
+			ib->ptr[ib->length_dw++] = src & 0xffffffff;
+			ib->ptr[ib->length_dw++] = upper_32_bits(src);
+			ib->ptr[ib->length_dw++] = pe & 0xffffffff;
+			ib->ptr[ib->length_dw++] = upper_32_bits(pe);
+
+			pe += bytes;
+			src += bytes;
+			count -= bytes / 8;
+		}
+	} else if (flags & R600_PTE_SYSTEM) {
 		while (count) {
 			ndw = count * 2;
 			if (ndw > 0xFFFFE)
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] drm/radeon: optimize CIK VM handling
  2014-05-27 14:47 ` [PATCH 3/3] drm/radeon: optimize CIK " Christian König
@ 2014-05-27 15:44   ` Alex Deucher
  2014-05-27 17:36     ` Christian König
  0 siblings, 1 reply; 8+ messages in thread
From: Alex Deucher @ 2014-05-27 15:44 UTC (permalink / raw)
  To: Christian König; +Cc: Maling list - DRI developers

On Tue, May 27, 2014 at 10:47 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Fill VM page tables from the GART page table if applicable.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>  drivers/gpu/drm/radeon/cik_sdma.c | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
> index f7e46cf..5bd3fe8 100644
> --- a/drivers/gpu/drm/radeon/cik_sdma.c
> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
> @@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev,
>
>         trace_radeon_vm_set_page(pe, addr, count, incr, flags);
>
> -       if (flags & R600_PTE_SYSTEM) {
> +       if (flags == R600_PTE_GART) {
> +               uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
> +               while (count) {
> +                       unsigned bytes = count * 8;
> +                       if (bytes > 0x1FFFF8)
> +                               bytes = 0x1FFFF8;
> +
> +                       ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);


Copy paste typo?  This should be SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR.

With that fixed, this patch is:

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> +                       ib->ptr[ib->length_dw++] = bytes;
> +                       ib->ptr[ib->length_dw++] = 0; /* src/dst endian swap */
> +                       ib->ptr[ib->length_dw++] = src & 0xffffffff;
> +                       ib->ptr[ib->length_dw++] = upper_32_bits(src);
> +                       ib->ptr[ib->length_dw++] = pe & 0xffffffff;
> +                       ib->ptr[ib->length_dw++] = upper_32_bits(pe);
> +
> +                       pe += bytes;
> +                       src += bytes;
> +                       count -= bytes / 8;
> +               }
> +       } else if (flags & R600_PTE_SYSTEM) {
>                 while (count) {
>                         ndw = count * 2;
>                         if (ndw > 0xFFFFE)
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT
  2014-05-27 14:47 [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Christian König
  2014-05-27 14:47 ` [PATCH 2/3] drm/radeon: optimize SI VM handling Christian König
  2014-05-27 14:47 ` [PATCH 3/3] drm/radeon: optimize CIK " Christian König
@ 2014-05-27 15:44 ` Alex Deucher
  2 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2014-05-27 15:44 UTC (permalink / raw)
  To: Christian König; +Cc: Maling list - DRI developers

On Tue, May 27, 2014 at 10:47 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] drm/radeon: optimize SI VM handling
  2014-05-27 14:47 ` [PATCH 2/3] drm/radeon: optimize SI VM handling Christian König
@ 2014-05-27 15:45   ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2014-05-27 15:45 UTC (permalink / raw)
  To: Christian König; +Cc: Maling list - DRI developers

On Tue, May 27, 2014 at 10:47 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Fill VM page tables from the GART page table if applicable.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/radeon/si_dma.c | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c
> index cf0fdad..9521669 100644
> --- a/drivers/gpu/drm/radeon/si_dma.c
> +++ b/drivers/gpu/drm/radeon/si_dma.c
> @@ -79,7 +79,25 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
>
>         trace_radeon_vm_set_page(pe, addr, count, incr, flags);
>
> -       if (flags & R600_PTE_SYSTEM) {
> +       if (flags == R600_PTE_GART) {
> +               uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
> +               while (count) {
> +                       unsigned bytes = count * 8;
> +                       if (bytes > 0xFFFF8)
> +                               bytes = 0xFFFF8;
> +
> +                       ib->ptr[ib->length_dw++] = DMA_PACKET(DMA_PACKET_COPY,
> +                                                             1, 0, 0, bytes);
> +                       ib->ptr[ib->length_dw++] = pe & 0xffffffff;
> +                       ib->ptr[ib->length_dw++] = src & 0xffffffff;
> +                       ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
> +                       ib->ptr[ib->length_dw++] = upper_32_bits(src) & 0xff;
> +
> +                       pe += bytes;
> +                       src += bytes;
> +                       count -= bytes / 8;
> +               }
> +       } else if (flags & R600_PTE_SYSTEM) {
>                 while (count) {
>                         ndw = count * 2;
>                         if (ndw > 0xFFFFE)
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] drm/radeon: optimize CIK VM handling
  2014-05-27 15:44   ` Alex Deucher
@ 2014-05-27 17:36     ` Christian König
  2014-05-27 18:07       ` Alex Deucher
  0 siblings, 1 reply; 8+ messages in thread
From: Christian König @ 2014-05-27 17:36 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Maling list - DRI developers

Am 27.05.2014 17:44, schrieb Alex Deucher:
> On Tue, May 27, 2014 at 10:47 AM, Christian König
> <deathsimple@vodafone.de> wrote:
>> From: Christian König <christian.koenig@amd.com>
>>
>> Fill VM page tables from the GART page table if applicable.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>>   drivers/gpu/drm/radeon/cik_sdma.c | 21 ++++++++++++++++++++-
>>   1 file changed, 20 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
>> index f7e46cf..5bd3fe8 100644
>> --- a/drivers/gpu/drm/radeon/cik_sdma.c
>> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
>> @@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev,
>>
>>          trace_radeon_vm_set_page(pe, addr, count, incr, flags);
>>
>> -       if (flags & R600_PTE_SYSTEM) {
>> +       if (flags == R600_PTE_GART) {
>> +               uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
>> +               while (count) {
>> +                       unsigned bytes = count * 8;
>> +                       if (bytes > 0x1FFFF8)
>> +                               bytes = 0x1FFFF8;
>> +
>> +                       ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
>
> Copy paste typo?  This should be SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR.

Oh, yes indeed. Thanks for the info.

Going to resend this patch in a minute. Can you add them to your 
3.16-wip branch?

Thanks,
Christian.

>
> With that fixed, this patch is:
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
>> +                       ib->ptr[ib->length_dw++] = bytes;
>> +                       ib->ptr[ib->length_dw++] = 0; /* src/dst endian swap */
>> +                       ib->ptr[ib->length_dw++] = src & 0xffffffff;
>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(src);
>> +                       ib->ptr[ib->length_dw++] = pe & 0xffffffff;
>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>> +
>> +                       pe += bytes;
>> +                       src += bytes;
>> +                       count -= bytes / 8;
>> +               }
>> +       } else if (flags & R600_PTE_SYSTEM) {
>>                  while (count) {
>>                          ndw = count * 2;
>>                          if (ndw > 0xFFFFE)
>> --
>> 1.9.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] drm/radeon: optimize CIK VM handling
  2014-05-27 17:36     ` Christian König
@ 2014-05-27 18:07       ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2014-05-27 18:07 UTC (permalink / raw)
  To: Christian König; +Cc: Maling list - DRI developers

On Tue, May 27, 2014 at 1:36 PM, Christian König
<deathsimple@vodafone.de> wrote:
> Am 27.05.2014 17:44, schrieb Alex Deucher:
>
>> On Tue, May 27, 2014 at 10:47 AM, Christian König
>> <deathsimple@vodafone.de> wrote:
>>>
>>> From: Christian König <christian.koenig@amd.com>
>>>
>>> Fill VM page tables from the GART page table if applicable.
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>> ---
>>>   drivers/gpu/drm/radeon/cik_sdma.c | 21 ++++++++++++++++++++-
>>>   1 file changed, 20 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/cik_sdma.c
>>> b/drivers/gpu/drm/radeon/cik_sdma.c
>>> index f7e46cf..5bd3fe8 100644
>>> --- a/drivers/gpu/drm/radeon/cik_sdma.c
>>> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
>>> @@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device
>>> *rdev,
>>>
>>>          trace_radeon_vm_set_page(pe, addr, count, incr, flags);
>>>
>>> -       if (flags & R600_PTE_SYSTEM) {
>>> +       if (flags == R600_PTE_GART) {
>>> +               uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
>>> +               while (count) {
>>> +                       unsigned bytes = count * 8;
>>> +                       if (bytes > 0x1FFFF8)
>>> +                               bytes = 0x1FFFF8;
>>> +
>>> +                       ib->ptr[ib->length_dw++] =
>>> SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
>>
>>
>> Copy paste typo?  This should be SDMA_OPCODE_COPY,
>> SDMA_COPY_SUB_OPCODE_LINEAR.
>
>
> Oh, yes indeed. Thanks for the info.
>
> Going to resend this patch in a minute. Can you add them to your 3.16-wip
> branch?

Will do.

Alex

>
> Thanks,
> Christian.
>
>
>>
>> With that fixed, this patch is:
>>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>
>>> +                       ib->ptr[ib->length_dw++] = bytes;
>>> +                       ib->ptr[ib->length_dw++] = 0; /* src/dst endian
>>> swap */
>>> +                       ib->ptr[ib->length_dw++] = src & 0xffffffff;
>>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(src);
>>> +                       ib->ptr[ib->length_dw++] = pe & 0xffffffff;
>>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>>> +
>>> +                       pe += bytes;
>>> +                       src += bytes;
>>> +                       count -= bytes / 8;
>>> +               }
>>> +       } else if (flags & R600_PTE_SYSTEM) {
>>>                  while (count) {
>>>                          ndw = count * 2;
>>>                          if (ndw > 0xFFFFE)
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-05-27 18:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27 14:47 [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Christian König
2014-05-27 14:47 ` [PATCH 2/3] drm/radeon: optimize SI VM handling Christian König
2014-05-27 15:45   ` Alex Deucher
2014-05-27 14:47 ` [PATCH 3/3] drm/radeon: optimize CIK " Christian König
2014-05-27 15:44   ` Alex Deucher
2014-05-27 17:36     ` Christian König
2014-05-27 18:07       ` Alex Deucher
2014-05-27 15:44 ` [PATCH 1/3] drm/radeon: add define for flags used in R600+ GTT Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.