Mesa (master): intel: Disable loading drivers on DG1 devices for now

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8278a46b26a690b58b85454eccc48caf65012671
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8278a46b26a690b58b85454eccc48caf65012671

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jun 23 14:04:42 2020 -0700

intel: Disable loading drivers on DG1 devices for now

Kernel support for DG1 has not yet been merged upstream; per our
long-standing DRM subsystem policy, we should not enable the platform
in userspace until the kernel patches are merged and functional.

We will re-enable this in the future.  In the meantime, we retain all
of the infrastructure and code for the platform so that we can continue
developing DG1 support in upstream.

See a discussion here:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4956#note_547775

Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5617>

---

 include/pci_ids/iris_pci_ids.h  | 3 ++-
 src/intel/dev/gen_device_info.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h
index d69fcb9c8d4..8a2827b0c35 100644
--- a/include/pci_ids/iris_pci_ids.h
+++ b/include/pci_ids/iris_pci_ids.h
@@ -16,4 +16,5 @@ CHIPSET(0x9AC9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AD9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AF8, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 
-CHIPSET(0x4905, dg1, "DG1 GT2", "Intel(R) Graphics")
+/* Disabled for now until kernel support is ready */
+/* CHIPSET(0x4905, dg1, "DG1 GT2", "Intel(R) Graphics") */
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 7630bb03b10..e7c7395cefd 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -1058,7 +1058,7 @@ static const struct gen_device_info gen_device_info_rkl_gt1 = {
    .urb.size = 768,                             \
    .simulator_id = 30
 
-static const struct gen_device_info gen_device_info_dg1 = {
+UNUSED static const struct gen_device_info gen_device_info_dg1 = {
    GEN12_DG1_FEATURES,
 };