]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/lmem: Check against i915_selftest only under CONFIG_SELFTEST
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 1 Nov 2019 09:51:47 +0000 (09:51 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 1 Nov 2019 10:12:29 +0000 (10:12 +0000)
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
drivers/gpu/drm/i915/i915_drv.c

index 480e2054f628e96dbad89724a17de99fd7bffc2d..3340485c12e3a7846ecc26c4d5dac567fee944c3 100644 (file)
@@ -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)