diff mbox

[1/3] drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe

Message ID 1406627242-14901-1-git-send-email-michel@daenzer.net (mailing list archive)
State New, archived
Headers show

Commit Message

Michel Dänzer July 29, 2014, 9:47 a.m. UTC
From: Michel Dänzer <michel.daenzer@amd.com>

PCI GART doesn't support unsnooped access. AGP GART already uses
write-combined CPU mappings.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
 drivers/gpu/drm/radeon/radeon_ring.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Christian König July 29, 2014, 9:54 a.m. UTC | #1
Am 29.07.2014 um 11:47 schrieb Michel Dänzer:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> PCI GART doesn't support unsnooped access. AGP GART already uses
> write-combined CPU mappings.
>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>

For this series Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/radeon/radeon_ring.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 71439f0..7cfea7e 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -640,7 +640,9 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
>   	/* Allocate ring buffer */
>   	if (ring->ring_obj == NULL) {
>   		r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
> -				     RADEON_GEM_DOMAIN_GTT, 0,
> +				     RADEON_GEM_DOMAIN_GTT,
> +				     (rdev->flags & RADEON_IS_PCIE) ?
> +				     RADEON_GEM_GTT_WC : 0,
>   				     NULL, &ring->ring_obj);
>   		if (r) {
>   			dev_err(rdev->dev, "(%d) ring create failed\n", r);
Alex Deucher July 29, 2014, 1:14 p.m. UTC | #2
On Tue, Jul 29, 2014 at 5:54 AM, Christian König
<deathsimple@vodafone.de> wrote:
> Am 29.07.2014 um 11:47 schrieb Michel Dänzer:
>
>> From: Michel Dänzer <michel.daenzer@amd.com>
>>
>> PCI GART doesn't support unsnooped access. AGP GART already uses
>> write-combined CPU mappings.
>>
>> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
>
>
> For this series Reviewed-by: Christian König <christian.koenig@amd.com>

Applied to my 3.17 tree.

Thanks.

>
>
>> ---
>>   drivers/gpu/drm/radeon/radeon_ring.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c
>> b/drivers/gpu/drm/radeon/radeon_ring.c
>> index 71439f0..7cfea7e 100644
>> --- a/drivers/gpu/drm/radeon/radeon_ring.c
>> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
>> @@ -640,7 +640,9 @@ int radeon_ring_init(struct radeon_device *rdev,
>> struct radeon_ring *ring, unsig
>>         /* Allocate ring buffer */
>>         if (ring->ring_obj == NULL) {
>>                 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE,
>> true,
>> -                                    RADEON_GEM_DOMAIN_GTT, 0,
>> +                                    RADEON_GEM_DOMAIN_GTT,
>> +                                    (rdev->flags & RADEON_IS_PCIE) ?
>> +                                    RADEON_GEM_GTT_WC : 0,
>>                                      NULL, &ring->ring_obj);
>>                 if (r) {
>>                         dev_err(rdev->dev, "(%d) ring create failed\n",
>> r);
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 71439f0..7cfea7e 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -640,7 +640,9 @@  int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
 	/* Allocate ring buffer */
 	if (ring->ring_obj == NULL) {
 		r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
-				     RADEON_GEM_DOMAIN_GTT, 0,
+				     RADEON_GEM_DOMAIN_GTT,
+				     (rdev->flags & RADEON_IS_PCIE) ?
+				     RADEON_GEM_GTT_WC : 0,
 				     NULL, &ring->ring_obj);
 		if (r) {
 			dev_err(rdev->dev, "(%d) ring create failed\n", r);