On Mon, Oct 08, 2018 at 03:35:16PM +0200, Christian König wrote: > Just the common helper and a new ring in the SDMA instance. > > Signed-off-by: Christian König <[email protected]>
Reviewed-by: Huang Rui <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 10 ++++------ > drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c > index bc9244b429ef..0fb9907494bb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c > @@ -34,11 +34,9 @@ struct amdgpu_sdma_instance * > amdgpu_get_sdma_instance(struct amdgpu_ring *ring) > int i; > > for (i = 0; i < adev->sdma.num_instances; i++) > - if (&adev->sdma.instance[i].ring == ring) > - break; > + if (ring == &adev->sdma.instance[i].ring || > + ring == &adev->sdma.instance[i].page) > + return &adev->sdma.instance[i]; > > - if (i < AMDGPU_MAX_SDMA_INSTANCES) > - return &adev->sdma.instance[i]; > - else > - return NULL; > + return NULL; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h > index 500113ec65ca..556db42edaed 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h > @@ -41,6 +41,7 @@ struct amdgpu_sdma_instance { > uint32_t feature_version; > > struct amdgpu_ring ring; > + struct amdgpu_ring page; > bool burst_nop; > }; > > -- > 2.14.1 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
