diff mbox

drm/radeon: don't use PACKET2 on CIK

Message ID 1383140495-24678-1-git-send-email-maraeo@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marek Olšák Oct. 30, 2013, 1:41 p.m. UTC 
From: Marek Olšák <marek.olsak@amd.com>

It is said to cause hangs.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
---
 drivers/gpu/drm/radeon/cik.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christian König Oct. 30, 2013, 1:50 p.m. UTC | #1 
Am 30.10.2013 14:41, schrieb Marek Olšák:
> From: Marek Olšák <marek.olsak@amd.com>
>
> It is said to cause hangs.
>
> Signed-off-by: Marek Olšák <marek.olsak@amd.com>

We should probably do so for SI as well.

Patch is Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/radeon/cik.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 2cd2ac0..44507a4 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
>   	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
>   	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
>   			     CP_RB0_RPTR, CP_RB0_WPTR,
> -			     RADEON_CP_PACKET2);
> +			     PACKET3(PACKET3_NOP, 0x3FFF));
>   	if (r)
>   		return r;
>
Alex Deucher Oct. 30, 2013, 1:52 p.m. UTC | #2 
On Wed, Oct 30, 2013 at 9:50 AM, Christian König
<deathsimple@vodafone.de> wrote:
> Am 30.10.2013 14:41, schrieb Marek Olšák:
>
>> From: Marek Olšák <marek.olsak@amd.com>
>>
>> It is said to cause hangs.
>>
>> Signed-off-by: Marek Olšák <marek.olsak@amd.com>
>
>
> We should probably do so for SI as well.
>

SI doesn't support single DW type 3 nop packets and AFAIK, there are
no bugs with type 2 packet handling on SI.

Alex

> Patch is Reviewed-by: Christian König <christian.koenig@amd.com>
>
>
>> ---
>>   drivers/gpu/drm/radeon/cik.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
>> index 2cd2ac0..44507a4 100644
>> --- a/drivers/gpu/drm/radeon/cik.c
>> +++ b/drivers/gpu/drm/radeon/cik.c
>> @@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
>>         ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
>>         r = radeon_ring_init(rdev, ring, ring->ring_size,
>> RADEON_WB_CP_RPTR_OFFSET,
>>                              CP_RB0_RPTR, CP_RB0_WPTR,
>> -                            RADEON_CP_PACKET2);
>> +                            PACKET3(PACKET3_NOP, 0x3FFF));
>>         if (r)
>>                 return r;
>>
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher Oct. 30, 2013, 2:32 p.m. UTC | #3 
On Wed, Oct 30, 2013 at 9:41 AM, Marek Olšák <maraeo@gmail.com> wrote:
> From: Marek Olšák <marek.olsak@amd.com>
>
> It is said to cause hangs.
>
> Signed-off-by: Marek Olšák <marek.olsak@amd.com>


Applied!  Thanks.

> ---
>  drivers/gpu/drm/radeon/cik.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 2cd2ac0..44507a4 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
>         ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
>         r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
>                              CP_RB0_RPTR, CP_RB0_WPTR,
> -                            RADEON_CP_PACKET2);
> +                            PACKET3(PACKET3_NOP, 0x3FFF));
>         if (r)
>                 return r;
>
> --
> 1.8.1.2
>
> _______________________________________________
> 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/cik.c b/drivers/gpu/drm/radeon/cik.c
index 2cd2ac0..44507a4 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -7134,7 +7134,7 @@  static int cik_startup(struct radeon_device *rdev)
 	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
 	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
 			     CP_RB0_RPTR, CP_RB0_WPTR,
-			     RADEON_CP_PACKET2);
+			     PACKET3(PACKET3_NOP, 0x3FFF));
 	if (r)
 		return r;