[PATCH 08/10] drm/xe: Remove pte_encode_bo callback

[Juha-Pekka Heikkilä]

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>

On Mon, May 5, 2025 at 3:20 PM Maarten Lankhorst <dev at lankhorst.se> wrote:
>
> The users inside display have been converted to use thepte_encode_flags
> callback, we can now remove the pte_encode_bo cb.
>
> Signed-off-by: Maarten Lankhorst <dev at lankhorst.se>
> ---
>  drivers/gpu/drm/xe/xe_ggtt.c       | 14 --------------
>  drivers/gpu/drm/xe/xe_ggtt_types.h |  3 ---
>  2 files changed, 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
> index 59097c7a494b2..20d49a96c2407 100644
> --- a/drivers/gpu/drm/xe/xe_ggtt.c
> +++ b/drivers/gpu/drm/xe/xe_ggtt.c
> @@ -75,11 +75,6 @@ static u64 xelp_ggtt_pte_flags(struct xe_bo *bo, u16 pat_index)
>         return pte;
>  }
>
> -static u64 xelp_ggtt_encode_bo(struct xe_bo *bo, u64 bo_offset, u16 pat_index)
> -{
> -       return xelp_ggtt_pte_flags(bo, pat_index) | xe_bo_addr(bo, bo_offset, XE_PAGE_SIZE);
> -}
> -
>  static u64 xelpg_ggtt_pte_flags(struct xe_bo *bo, u16 pat_index)
>  {
>         struct xe_device *xe = xe_bo_device(bo);
> @@ -98,12 +93,6 @@ static u64 xelpg_ggtt_pte_flags(struct xe_bo *bo, u16 pat_index)
>         return pte;
>  }
>
> -static u64 xelpg_ggtt_encode_bo(struct xe_bo *bo, u64 bo_offset,
> -                               u16 pat_index)
> -{
> -       return xelpg_ggtt_pte_flags(bo, pat_index) | xe_bo_addr(bo, bo_offset, XE_PAGE_SIZE);
> -}
> -
>  static unsigned int probe_gsm_size(struct pci_dev *pdev)
>  {
>         u16 gmch_ctl, ggms;
> @@ -218,19 +207,16 @@ static void primelockdep(struct xe_ggtt *ggtt)
>  }
>
>  static const struct xe_ggtt_pt_ops xelp_pt_ops = {
> -       .pte_encode_bo = xelp_ggtt_encode_bo,
>         .pte_encode_flags = xelp_ggtt_pte_flags,
>         .ggtt_set_pte = xe_ggtt_set_pte,
>  };
>
>  static const struct xe_ggtt_pt_ops xelpg_pt_ops = {
> -       .pte_encode_bo = xelpg_ggtt_encode_bo,
>         .pte_encode_flags = xelpg_ggtt_pte_flags,
>         .ggtt_set_pte = xe_ggtt_set_pte,
>  };
>
>  static const struct xe_ggtt_pt_ops xelpg_pt_wa_ops = {
> -       .pte_encode_bo = xelpg_ggtt_encode_bo,
>         .pte_encode_flags = xelpg_ggtt_pte_flags,
>         .ggtt_set_pte = xe_ggtt_set_pte_and_flush,
>  };
> diff --git a/drivers/gpu/drm/xe/xe_ggtt_types.h b/drivers/gpu/drm/xe/xe_ggtt_types.h
> index 06b1a602dd8d1..c5e999d58ff2a 100644
> --- a/drivers/gpu/drm/xe/xe_ggtt_types.h
> +++ b/drivers/gpu/drm/xe/xe_ggtt_types.h
> @@ -74,9 +74,6 @@ struct xe_ggtt_node {
>   * Which can vary from platform to platform.
>   */
>  struct xe_ggtt_pt_ops {
> -       /** @pte_encode_bo: Encode PTE flags for a given BO */
> -       u64 (*pte_encode_bo)(struct xe_bo *bo, u64 bo_offset, u16 pat_index);
> -
>         /** @pte_encode_flags: Encode PTE flags for a given BO */
>         u64 (*pte_encode_flags)(struct xe_bo *bo, u16 pat_index);
>         /** @ggtt_set_pte: Directly write into GGTT's PTE */
> --
> 2.45.2
>