[PATCH] drm/amdgpu:fix get wrong gfx always on cu masks.

[Deucher, Alexander]

> -----Original Message-----
> From: Deucher, Alexander
> Sent: Wednesday, April 26, 2017 12:11 PM
> To: Zhu, Rex; amd-gfx at lists.freedesktop.org
> Cc: Zhu, Rex
> Subject: RE: [PATCH] drm/amdgpu:fix get wrong gfx always on cu masks.
> 
> > -----Original Message-----
> > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> > Of Rex Zhu
> > Sent: Wednesday, April 26, 2017 4:36 AM
> > To: amd-gfx at lists.freedesktop.org
> > Cc: Zhu, Rex
> > Subject: [PATCH] drm/amdgpu:fix get wrong gfx always on cu masks.
> >
> > Change-Id: I46d7f2531eaec8135ccaf64b5ce8abc433c54e1a
> > Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
> 
> Acked-by: Alex Deucher <alexander.deucher at amd.com>


Might also want to mention the JIRA ticket id in the commit message.

Alex

> 
> > ---
> >  drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 10 ++++++++--
> >  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 10 ++++++++--
> >  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 10 ++++++++--
> >  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |  4 ++--
> >  4 files changed, 26 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> > index f7579de..25c3703 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> > @@ -3719,6 +3719,12 @@ static void gfx_v6_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;
> >  	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;
> >  	unsigned disable_masks[4 * 2];
> > +	u32 ao_cu_num;
> > +
> > +	if (adev->flags & AMD_IS_APU)
> > +		ao_cu_num = 2;
> > +	else
> > +		ao_cu_num = adev->gfx.config.max_cu_per_sh;
> >
> >  	memset(cu_info, 0, sizeof(*cu_info));
> >
> > @@ -3737,9 +3743,9 @@ static void gfx_v6_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  			bitmap = gfx_v6_0_get_cu_enabled(adev);
> >  			cu_info->bitmap[i][j] = bitmap;
> >
> > -			for (k = 0; k < 16; k++) {
> > +			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k++)
> > {
> >  				if (bitmap & mask) {
> > -					if (counter < 2)
> > +					if (counter < ao_cu_num)
> >  						ao_bitmap |= mask;
> >  					counter ++;
> >  				}
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> > index fa5a0d2..75cca54 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> > @@ -5339,6 +5339,12 @@ static void gfx_v7_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;
> >  	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;
> >  	unsigned disable_masks[4 * 2];
> > +	u32 ao_cu_num;
> > +
> > +	if (adev->flags & AMD_IS_APU)
> > +		ao_cu_num = 2;
> > +	else
> > +		ao_cu_num = adev->gfx.config.max_cu_per_sh;
> >
> >  	memset(cu_info, 0, sizeof(*cu_info));
> >
> > @@ -5357,9 +5363,9 @@ static void gfx_v7_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  			bitmap = gfx_v7_0_get_cu_active_bitmap(adev);
> >  			cu_info->bitmap[i][j] = bitmap;
> >
> > -			for (k = 0; k < 16; k ++) {
> > +			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++)
> > {
> >  				if (bitmap & mask) {
> > -					if (counter < 2)
> > +					if (counter < ao_cu_num)
> >  						ao_bitmap |= mask;
> >  					counter ++;
> >  				}
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> > index 2ff5f19..0025ef6 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> > @@ -7098,9 +7098,15 @@ static void gfx_v8_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;
> >  	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;
> >  	unsigned disable_masks[4 * 2];
> > +	u32 ao_cu_num;
> >
> >  	memset(cu_info, 0, sizeof(*cu_info));
> >
> > +	if (adev->flags & AMD_IS_APU)
> > +		ao_cu_num = 2;
> > +	else
> > +		ao_cu_num = adev->gfx.config.max_cu_per_sh;
> > +
> >  	amdgpu_gfx_parse_disable_cu(disable_masks, 4, 2);
> >
> >  	mutex_lock(&adev->grbm_idx_mutex);
> > @@ -7116,9 +7122,9 @@ static void gfx_v8_0_get_cu_info(struct
> > amdgpu_device *adev)
> >  			bitmap = gfx_v8_0_get_cu_active_bitmap(adev);
> >  			cu_info->bitmap[i][j] = bitmap;
> >
> > -			for (k = 0; k < 16; k ++) {
> > +			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++)
> > {
> >  				if (bitmap & mask) {
> > -					if (counter < 2)
> > +					if (counter < ao_cu_num)
> >  						ao_bitmap |= mask;
> >  					counter ++;
> >  				}
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > index 42cfd3b..13da795 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > @@ -3667,9 +3667,9 @@ static int gfx_v9_0_get_cu_info(struct
> > amdgpu_device *adev,
> >  			bitmap = gfx_v9_0_get_cu_active_bitmap(adev);
> >  			cu_info->bitmap[i][j] = bitmap;
> >
> > -			for (k = 0; k < 16; k ++) {
> > +			for (k = 0; k < adev->gfx.config.max_cu_per_sh; k ++)
> > {
> >  				if (bitmap & mask) {
> > -					if (counter < 2)
> > +					if (counter < adev-
> > >gfx.config.max_cu_per_sh)
> >  						ao_bitmap |= mask;
> >  					counter ++;
> >  				}
> > --
> > 1.9.1
> >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx