[2/2] drm/amdgpu:fix typo

Submitted by Liu, Monk on Sept. 30, 2016, 3:56 a.m.

Details

Message ID 1475207799-5054-2-git-send-email-Monk.Liu@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Liu, Monk Sept. 30, 2016, 3:56 a.m.
COND_EXEC are needed by GFX ring

Change-Id: I4819300444061cb92b3bed44da660f82f2fc755e
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index efce228..9c18920 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -167,7 +167,7 @@  int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 		return r;
 	}
 
-	if (ring->type == AMDGPU_RING_TYPE_SDMA && ring->funcs->init_cond_exec)
+	if (ring->type == AMDGPU_RING_TYPE_GFX && ring->funcs->init_cond_exec)
 		patch_offset = amdgpu_ring_init_cond_exec(ring);
 
 	if (vm) {

Comments

On Thu, Sep 29, 2016 at 11:56 PM, Monk Liu <Monk.Liu@amd.com> wrote:
> COND_EXEC are needed by GFX ring
>
> Change-Id: I4819300444061cb92b3bed44da660f82f2fc755e
> Signed-off-by: Monk Liu <Monk.Liu@amd.com>

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

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index efce228..9c18920 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -167,7 +167,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
>                 return r;
>         }
>
> -       if (ring->type == AMDGPU_RING_TYPE_SDMA && ring->funcs->init_cond_exec)
> +       if (ring->type == AMDGPU_RING_TYPE_GFX && ring->funcs->init_cond_exec)
>                 patch_offset = amdgpu_ring_init_cond_exec(ring);
>
>         if (vm) {
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 30.09.2016 um 16:51 schrieb Alex Deucher:
> On Thu, Sep 29, 2016 at 11:56 PM, Monk Liu <Monk.Liu@amd.com> wrote:
>> COND_EXEC are needed by GFX ring
>>
>> Change-Id: I4819300444061cb92b3bed44da660f82f2fc755e
>> Signed-off-by: Monk Liu <Monk.Liu@amd.com>
> Acked-by: Alex Deucher <alexander.deucher@amd.com>

I would rather say just drop the ring type check completely and only 
check if the init_cond_exec callback is present or not.

Christian.

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> index efce228..9c18920 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
>> @@ -167,7 +167,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
>>                  return r;
>>          }
>>
>> -       if (ring->type == AMDGPU_RING_TYPE_SDMA && ring->funcs->init_cond_exec)
>> +       if (ring->type == AMDGPU_RING_TYPE_GFX && ring->funcs->init_cond_exec)
>>                  patch_offset = amdgpu_ring_init_cond_exec(ring);
>>
>>          if (vm) {
>> --
>> 1.9.1
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx