[Intel-xe] [RFC PATCH 4/4] drm/xe: Add function pointers for all supported platforms
Francois Dugast
francois.dugast at intel.com
Fri Mar 3 14:50:15 UTC 2023
This patch extend the function pointers to all supported platform
by pointing when possible to an existing implementation of
setup_private_ppat rather than duplicating code.
Signed-off-by: Francois Dugast <francois.dugast at intel.com>
---
drivers/gpu/drm/xe/Makefile | 5 +++++
drivers/gpu/drm/xe/xe_device.c | 15 +++++++++++++++
drivers/gpu/drm/xe/xe_platform.h | 5 +++++
drivers/gpu/drm/xe/xe_platform_adlp.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_platform_adls.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_platform_dg1.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_platform_dg2.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_platform_rkl.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_platform_tgl.c | 2 +-
drivers/gpu/drm/xe/xe_platform_tgl.h | 13 +++++++++++++
10 files changed, 129 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/xe/xe_platform_adlp.c
create mode 100644 drivers/gpu/drm/xe/xe_platform_adls.c
create mode 100644 drivers/gpu/drm/xe/xe_platform_dg1.c
create mode 100644 drivers/gpu/drm/xe/xe_platform_dg2.c
create mode 100644 drivers/gpu/drm/xe/xe_platform_rkl.c
create mode 100644 drivers/gpu/drm/xe/xe_platform_tgl.h
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index c28831a10ae0..5124b9973522 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -72,8 +72,13 @@ xe-y += xe_bb.o \
xe_module.o \
xe_pci.o \
xe_pcode.o \
+ xe_platform_adlp.o \
+ xe_platform_adls.o \
+ xe_platform_dg1.o \
+ xe_platform_dg2.o \
xe_platform_mtl.o \
xe_platform_pvc.o \
+ xe_platform_rkl.o \
xe_platform_tgl.o \
xe_pm.o \
xe_preempt_fence.o \
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index f1f7a50d92c7..dfb391e285c4 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -266,9 +266,24 @@ int xe_device_probe(struct xe_device *xe)
case XE_TIGERLAKE:
tgl_set_funcs(xe);
break;
+ case XE_ROCKETLAKE:
+ rkl_set_funcs(xe);
+ break;
+ case XE_DG1:
+ dg1_set_funcs(xe);
+ break;
+ case XE_DG2:
+ dg2_set_funcs(xe);
+ break;
case XE_PVC:
pvc_set_funcs(xe);
break;
+ case XE_ALDERLAKE_S:
+ adls_set_funcs(xe);
+ break;
+ case XE_ALDERLAKE_P:
+ adlp_set_funcs(xe);
+ break;
case XE_METEORLAKE:
mtl_set_funcs(xe);
break;
diff --git a/drivers/gpu/drm/xe/xe_platform.h b/drivers/gpu/drm/xe/xe_platform.h
index f2bf48fac3f4..9aa35315d5bc 100644
--- a/drivers/gpu/drm/xe/xe_platform.h
+++ b/drivers/gpu/drm/xe/xe_platform.h
@@ -19,8 +19,13 @@ static inline void unsupported_platform_set_funcs(struct xe_device *xe)
xe->platform_funcs = &empty_funcs;
}
+void adlp_set_funcs(struct xe_device *xe);
+void adls_set_funcs(struct xe_device *xe);
+void dg1_set_funcs(struct xe_device *xe);
+void dg2_set_funcs(struct xe_device *xe);
void mtl_set_funcs(struct xe_device *xe);
void pvc_set_funcs(struct xe_device *xe);
+void rkl_set_funcs(struct xe_device *xe);
void tgl_set_funcs(struct xe_device *xe);
#endif /* _XE_PLATFORM_H_ */
diff --git a/drivers/gpu/drm/xe/xe_platform_adlp.c b/drivers/gpu/drm/xe/xe_platform_adlp.c
new file mode 100644
index 000000000000..c20e04adf176
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_adlp.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#include "xe_gt.h"
+#include "xe_gt_ppat.h"
+#include "xe_platform.h"
+#include "xe_platform_tgl.h"
+
+static const struct xe_platform_funcs adlp_funcs = {
+ .setup_private_ppat = tgl_setup_private_ppat,
+};
+
+void adlp_set_funcs(struct xe_device *xe)
+{
+ xe->platform_funcs = &adlp_funcs;
+}
diff --git a/drivers/gpu/drm/xe/xe_platform_adls.c b/drivers/gpu/drm/xe/xe_platform_adls.c
new file mode 100644
index 000000000000..daeb9dcd4b39
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_adls.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#include "xe_gt.h"
+#include "xe_gt_ppat.h"
+#include "xe_platform.h"
+#include "xe_platform_tgl.h"
+
+static const struct xe_platform_funcs adls_funcs = {
+ .setup_private_ppat = tgl_setup_private_ppat,
+};
+
+void adls_set_funcs(struct xe_device *xe)
+{
+ xe->platform_funcs = &adls_funcs;
+}
diff --git a/drivers/gpu/drm/xe/xe_platform_dg1.c b/drivers/gpu/drm/xe/xe_platform_dg1.c
new file mode 100644
index 000000000000..cffb293e8d21
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_dg1.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#include "xe_gt.h"
+#include "xe_gt_ppat.h"
+#include "xe_platform.h"
+#include "xe_platform_tgl.h"
+
+static const struct xe_platform_funcs dg1_funcs = {
+ .setup_private_ppat = tgl_setup_private_ppat,
+};
+
+void dg1_set_funcs(struct xe_device *xe)
+{
+ xe->platform_funcs = &dg1_funcs;
+}
diff --git a/drivers/gpu/drm/xe/xe_platform_dg2.c b/drivers/gpu/drm/xe/xe_platform_dg2.c
new file mode 100644
index 000000000000..e12859608abd
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_dg2.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#include "xe_gt.h"
+#include "xe_gt_ppat.h"
+#include "xe_platform.h"
+#include "xe_platform_tgl.h"
+
+static const struct xe_platform_funcs dg2_funcs = {
+ .setup_private_ppat = tgl_setup_private_ppat,
+};
+
+void dg2_set_funcs(struct xe_device *xe)
+{
+ xe->platform_funcs = &dg2_funcs;
+}
diff --git a/drivers/gpu/drm/xe/xe_platform_rkl.c b/drivers/gpu/drm/xe/xe_platform_rkl.c
new file mode 100644
index 000000000000..195402f4eb9c
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_rkl.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#include "xe_gt.h"
+#include "xe_gt_ppat.h"
+#include "xe_platform.h"
+#include "xe_platform_tgl.h"
+
+static const struct xe_platform_funcs rkl_funcs = {
+ .setup_private_ppat = tgl_setup_private_ppat,
+};
+
+void rkl_set_funcs(struct xe_device *xe)
+{
+ xe->platform_funcs = &rkl_funcs;
+}
diff --git a/drivers/gpu/drm/xe/xe_platform_tgl.c b/drivers/gpu/drm/xe/xe_platform_tgl.c
index 616c20b97844..11d8f38147f2 100644
--- a/drivers/gpu/drm/xe/xe_platform_tgl.c
+++ b/drivers/gpu/drm/xe/xe_platform_tgl.c
@@ -9,7 +9,7 @@
#include "xe_mmio.h"
#include "xe_platform.h"
-static void tgl_setup_private_ppat(struct xe_gt *gt)
+void tgl_setup_private_ppat(struct xe_gt *gt)
{
/* TGL doesn't support LLC or AGE settings */
xe_mmio_write32(gt, GEN12_PAT_INDEX(0).reg, GEN8_PPAT_WB);
diff --git a/drivers/gpu/drm/xe/xe_platform_tgl.h b/drivers/gpu/drm/xe/xe_platform_tgl.h
new file mode 100644
index 000000000000..babeb5c95334
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_platform_tgl.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_PLATFORM_TGL_H_
+#define _XE_PLATFORM_TGL_H_
+
+#include "xe_gt_types.h"
+
+void tgl_setup_private_ppat(struct xe_gt *gt);
+
+#endif /* _XE_PLATFORM_TGL_H_ */
--
2.25.1
More information about the Intel-xe
mailing list