From 292a27b0a807615f4c140b990802f109c72d6c8c Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 1 Nov 2019 09:51:47 +0000
Subject: drm/i915/lmem: Check against i915_selftest only under CONFIG_SELFTEST
Git-commit: 292a27b0a807615f4c140b990802f109c72d6c8c
Patch-mainline: v5.5-rc1
References: bsc#1152489
The i915_selftest module parameters only exist when
CONFIG_DRM_I915_SELFTEST is set.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101095147.9769-1-chris@chris-wilson.co.uk
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/i915/i915_drv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 480e2054f628..3340485c12e3 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1487,6 +1487,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* Check if we support fake LMEM -- for now we only unleash this for
* the live selftests(test-and-exit).
*/
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
if (IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM)) {
if (INTEL_GEN(dev_priv) >= 9 && i915_selftest.live < 0 &&
i915_modparams.fake_lmem_start) {
@@ -1497,6 +1498,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
GEM_BUG_ON(!IS_DGFX(dev_priv));
}
}
+#endif
ret = pci_enable_device(pdev);
if (ret)
--
2.28.0