drm/xe: Use vfunc for ggtt pte encoding

Use 2 different functions for encoding the ggtt's pte, assigning them
during initialization. Main difference is that before Xe-LPG, the pte
didn't have the cache bits.

v2: Re-use xelp_ggtt_pte_encode_bo() for the common part with
    xelpg_ggtt_pte_encode_bo() (Matt Roper)

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230927193902.2849159-11-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index ba34b8784572ef07c9ed3a854751b56992315099..ec7bbb1dc2958761af926377c8d50a1c0de53b42 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -20,16 +20,15 @@
 #include "xe_mmio.h"
 #include "xe_wopcm.h"
 
-/* FIXME: Common file, preferably auto-gen */
-#define MTL_GGTT_PTE_PAT0      BIT_ULL(52)
-#define MTL_GGTT_PTE_PAT1      BIT_ULL(53)
+#define XELPG_GGTT_PTE_PAT0    BIT_ULL(52)
+#define XELPG_GGTT_PTE_PAT1    BIT_ULL(53)
 
 /* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */
 #define GUC_GGTT_TOP   0xFEE00000
 
-u64 xe_ggtt_pte_encode(struct xe_bo *bo, u64 bo_offset)
+static u64 xelp_ggtt_pte_encode_bo(struct xe_bo *bo, u64 bo_offset,
+                                  enum xe_cache_level cache)
 {
-       struct xe_device *xe = xe_bo_device(bo);
        u64 pte;
 
        pte = xe_bo_addr(bo, bo_offset, XE_PAGE_SIZE);
@@ -38,11 +37,25 @@ u64 xe_ggtt_pte_encode(struct xe_bo *bo, u64 bo_offset)
        if (xe_bo_is_vram(bo) || xe_bo_is_stolen_devmem(bo))
                pte |= XE_GGTT_PTE_DM;
 
-       /* FIXME: vfunc + pass in caching rules */
-       if (xe->info.platform == XE_METEORLAKE) {
-               pte |= MTL_GGTT_PTE_PAT0;
-               pte |= MTL_GGTT_PTE_PAT1;
-       }
+       return pte;
+}
+
+static u64 xelpg_ggtt_pte_encode_bo(struct xe_bo *bo, u64 bo_offset,
+                                   enum xe_cache_level cache)
+{
+       struct xe_device *xe = xe_bo_device(bo);
+       u32 pat_index = xe->pat.idx[cache];
+       u64 pte;
+
+       pte = xelp_ggtt_pte_encode_bo(bo, bo_offset, cache);
+
+       xe_assert(xe, pat_index <= 3);
+
+       if (pat_index & BIT(0))
+               pte |= XELPG_GGTT_PTE_PAT0;
+
+       if (pat_index & BIT(1))
+               pte |= XELPG_GGTT_PTE_PAT1;
 
        return pte;
 }
@@ -72,7 +85,8 @@ static void xe_ggtt_clear(struct xe_ggtt *ggtt, u64 start, u64 size)
        xe_tile_assert(ggtt->tile, start < end);
 
        if (ggtt->scratch)
-               scratch_pte = xe_ggtt_pte_encode(ggtt->scratch, 0);
+               scratch_pte = ggtt->pt_ops->pte_encode_bo(ggtt->scratch, 0,
+                                                         XE_CACHE_WB);
        else
                scratch_pte = 0;
 
@@ -102,6 +116,14 @@ static void primelockdep(struct xe_ggtt *ggtt)
        fs_reclaim_release(GFP_KERNEL);
 }
 
+static const struct xe_ggtt_pt_ops xelp_pt_ops = {
+       .pte_encode_bo = xelp_ggtt_pte_encode_bo,
+};
+
+static const struct xe_ggtt_pt_ops xelpg_pt_ops = {
+       .pte_encode_bo = xelpg_ggtt_pte_encode_bo,
+};
+
 int xe_ggtt_init_noalloc(struct xe_ggtt *ggtt)
 {
        struct xe_device *xe = tile_to_xe(ggtt->tile);
@@ -146,6 +168,11 @@ int xe_ggtt_init_noalloc(struct xe_ggtt *ggtt)
        if (ggtt->size > GUC_GGTT_TOP)
                ggtt->size = GUC_GGTT_TOP;
 
+       if (GRAPHICS_VERx100(xe) >= 1270)
+               ggtt->pt_ops = &xelpg_pt_ops;
+       else
+               ggtt->pt_ops = &xelp_pt_ops;
+
        drm_mm_init(&ggtt->mm, xe_wopcm_size(xe),
                    ggtt->size - xe_wopcm_size(xe));
        mutex_init(&ggtt->lock);
@@ -260,7 +287,7 @@ void xe_ggtt_printk(struct xe_ggtt *ggtt, const char *prefix)
 {
        u64 addr, scratch_pte;
 
-       scratch_pte = xe_ggtt_pte_encode(ggtt->scratch, 0);
+       scratch_pte = ggtt->pt_ops->pte_encode_bo(ggtt->scratch, 0, XE_CACHE_WB);
 
        printk("%sGlobal GTT:", prefix);
        for (addr = 0; addr < ggtt->size; addr += XE_PAGE_SIZE) {
@@ -301,7 +328,7 @@ void xe_ggtt_map_bo(struct xe_ggtt *ggtt, struct xe_bo *bo)
        u64 offset, pte;
 
        for (offset = 0; offset < bo->size; offset += XE_PAGE_SIZE) {
-               pte = xe_ggtt_pte_encode(bo, offset);
+               pte = ggtt->pt_ops->pte_encode_bo(bo, offset, XE_CACHE_WB);
                xe_ggtt_set_pte(ggtt, start + offset, pte);
        }
 

diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h
index 8e7360926bea93864c031197c5685484599d84d7..04bb26b0938e2b62d9e2f71e379a15ed6c756f01 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.h
+++ b/drivers/gpu/drm/xe/xe_ggtt.h
@@ -10,7 +10,6 @@
 
 struct drm_printer;
 
-u64 xe_ggtt_pte_encode(struct xe_bo *bo, u64 bo_offset);
 void xe_ggtt_set_pte(struct xe_ggtt *ggtt, u64 addr, u64 pte);
 void xe_ggtt_invalidate(struct xe_ggtt *ggtt);
 int xe_ggtt_init_noalloc(struct xe_ggtt *ggtt);

diff --git a/drivers/gpu/drm/xe/xe_ggtt_types.h b/drivers/gpu/drm/xe/xe_ggtt_types.h
index d34b3e733945285cbdbbe5fd25913ab0b0e54ab5..486016ea5b67dccf9949214c0cb3d603d31394ba 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt_types.h
+++ b/drivers/gpu/drm/xe/xe_ggtt_types.h
@@ -8,9 +8,16 @@
 
 #include <drm/drm_mm.h>
 
+#include "xe_pt_types.h"
+
 struct xe_bo;
 struct xe_gt;
 
+struct xe_ggtt_pt_ops {
+       u64 (*pte_encode_bo)(struct xe_bo *bo, u64 bo_offset,
+                            enum xe_cache_level cache);
+};
+
 struct xe_ggtt {
        struct xe_tile *tile;
 
@@ -25,6 +32,8 @@ struct xe_ggtt {
 
        u64 __iomem *gsm;
 
+       const struct xe_ggtt_pt_ops *pt_ops;
+
        struct drm_mm mm;
 };