[PATCH] drm/amdkfd: Don't divide L2 cache by partition mode

[Russell, Kent]

[AMD Official Use Only - General]

Oh excellent, it didn't get merged in yet. Time to squash!

 Kent

> -----Original Message-----
> From: Kuehling, Felix <Felix.Kuehling at amd.com>
> Sent: Tuesday, February 6, 2024 4:29 PM
> To: Russell, Kent <Kent.Russell at amd.com>; amd-gfx at lists.freedesktop.org
> Cc: Joshi, Mukul <Mukul.Joshi at amd.com>
> Subject: Re: [PATCH] drm/amdkfd: Don't divide L2 cache by partition mode
>
>
> On 2024-02-06 16:24, Kent Russell wrote:
> > Partition mode only affects L3 cache size. After removing the L2 check in
> > the previous patch, make sure we aren't dividing all cache sizes by
> > partition mode, just L3.
> >
> > Fixes: a75bfb3c4045 ("drm/amdkfd: Fix L2 cache size reporting in GFX9.4.3")
> The fixes tag looks wrong. I can't find the commit a75bfb3c4045
> anywhere. Did your previous patch actually make it into the branch yet?
> Maybe you can still abandon it in Gerrit.
>
> Regards,
>    Felix
>
>
>
> > Signed-off-by: Kent Russell <kent.russell at amd.com>
> > ---
> >   drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 8 ++++----
> >   1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> > index 64bf2a56f010..533b8292b136 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> > @@ -1640,10 +1640,10 @@ static int fill_in_l2_l3_pcache(struct
> kfd_cache_properties **props_ext,
> >             else
> >                     mode = UNKNOWN_MEMORY_PARTITION_MODE;
> >
> > -           if (mode)
> > -                   pcache->cache_size =
> pcache_info[cache_type].cache_size / mode;
> > -           else
> > -                   pcache->cache_size =
> pcache_info[cache_type].cache_size;
> > +           pcache->cache_size = pcache_info[cache_type].cache_size;
> > +           /* Partition mode only affects L3 cache size */
> > +           if (mode && pcache->cache_level == 3)
> > +                   pcache->cache_size /= mode;
> >
> >             if (pcache_info[cache_type].flags &
> CRAT_CACHE_FLAGS_DATA_CACHE)
> >                     pcache->cache_type |= HSA_CACHE_TYPE_DATA;