[PATCH 2/2] drm/amdgpu: drop unused function

[Alex Deucher]

On Wed, May 3, 2023 at 11:20 AM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> Reviewed-by: Christian König <christian.koenig at amd.com> for this one.
>
> Can't say much about the first one. That was just the hack because some
> bit in the IP version was re-used on SRIOV, wasn't it?

Yes, the high 2 bits of the revision number were reused for additional
information so they needed to be masked out when considering the IP
revision.  We already track those extra bits elsewhere and mask out
those bits so that IP version is never seen anymore in practice.

Alex

>
> Christian.
>
> Am 03.05.23 um 17:02 schrieb Alex Deucher:
> > Ping?
> >
> > On Thu, Apr 27, 2023 at 2:34 PM Alex Deucher <alexander.deucher at amd.com> wrote:
> >> amdgpu_discovery_get_ip_version() has not been used since
> >> commit c40bdfb2ffa4 ("drm/amdgpu: fix incorrect VCN revision in SRIOV")
> >> so drop it.
> >>
> >> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> >> ---
> >>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 48 -------------------
> >>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h |  2 -
> >>   2 files changed, 50 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> >> index 76ceca05452e..b58d94dc1924 100644
> >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> >> @@ -1208,54 +1208,6 @@ static int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
> >>          return 0;
> >>   }
> >>
> >> -int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance,
> >> -                                   int *major, int *minor, int *revision)
> >> -{
> >> -       struct binary_header *bhdr;
> >> -       struct ip_discovery_header *ihdr;
> >> -       struct die_header *dhdr;
> >> -       struct ip *ip;
> >> -       uint16_t die_offset;
> >> -       uint16_t ip_offset;
> >> -       uint16_t num_dies;
> >> -       uint16_t num_ips;
> >> -       int i, j;
> >> -
> >> -       if (!adev->mman.discovery_bin) {
> >> -               DRM_ERROR("ip discovery uninitialized\n");
> >> -               return -EINVAL;
> >> -       }
> >> -
> >> -       bhdr = (struct binary_header *)adev->mman.discovery_bin;
> >> -       ihdr = (struct ip_discovery_header *)(adev->mman.discovery_bin +
> >> -                       le16_to_cpu(bhdr->table_list[IP_DISCOVERY].offset));
> >> -       num_dies = le16_to_cpu(ihdr->num_dies);
> >> -
> >> -       for (i = 0; i < num_dies; i++) {
> >> -               die_offset = le16_to_cpu(ihdr->die_info[i].die_offset);
> >> -               dhdr = (struct die_header *)(adev->mman.discovery_bin + die_offset);
> >> -               num_ips = le16_to_cpu(dhdr->num_ips);
> >> -               ip_offset = die_offset + sizeof(*dhdr);
> >> -
> >> -               for (j = 0; j < num_ips; j++) {
> >> -                       ip = (struct ip *)(adev->mman.discovery_bin + ip_offset);
> >> -
> >> -                       if ((le16_to_cpu(ip->hw_id) == hw_id) && (ip->number_instance == number_instance)) {
> >> -                               if (major)
> >> -                                       *major = ip->major;
> >> -                               if (minor)
> >> -                                       *minor = ip->minor;
> >> -                               if (revision)
> >> -                                       *revision = ip->revision;
> >> -                               return 0;
> >> -                       }
> >> -                       ip_offset += struct_size(ip, base_address, ip->num_base_address);
> >> -               }
> >> -       }
> >> -
> >> -       return -EINVAL;
> >> -}
> >> -
> >>   static void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
> >>   {
> >>          int vcn_harvest_count = 0;
> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
> >> index 8563dd4a7dc2..63ec6924b907 100644
> >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
> >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
> >> @@ -28,8 +28,6 @@
> >>   #define DISCOVERY_TMR_OFFSET    (64 << 10)
> >>
> >>   void amdgpu_discovery_fini(struct amdgpu_device *adev);
> >> -int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance,
> >> -                                    int *major, int *minor, int *revision);
> >>   int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev);
> >>
> >>   #endif /* __AMDGPU_DISCOVERY__ */
> >> --
> >> 2.40.0
> >>
>