diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 033c943b6bae..1d65dbd15c39 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1483,9 +1483,12 @@ static void intel_device_info_runtime_init(struct drm_device *dev) | |||
1483 | if (IS_VALLEYVIEW(dev)) | 1483 | if (IS_VALLEYVIEW(dev)) |
1484 | info->num_sprites = 2; | 1484 | info->num_sprites = 2; |
1485 | 1485 | ||
1486 | if (info->num_pipes > 0 && | 1486 | if (i915.disable_display) { |
1487 | (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) && | 1487 | DRM_INFO("Display disabled (module parameter)\n"); |
1488 | !IS_VALLEYVIEW(dev)) { | 1488 | info->num_pipes = 0; |
1489 | } else if (info->num_pipes > 0 && | ||
1490 | (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) && | ||
1491 | !IS_VALLEYVIEW(dev)) { | ||
1489 | u32 fuse_strap = I915_READ(FUSE_STRAP); | 1492 | u32 fuse_strap = I915_READ(FUSE_STRAP); |
1490 | u32 sfuse_strap = I915_READ(SFUSE_STRAP); | 1493 | u32 sfuse_strap = I915_READ(SFUSE_STRAP); |
1491 | 1494 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0580d979f88d..96601149cab8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1958,6 +1958,7 @@ struct i915_params { | |||
1958 | bool fastboot; | 1958 | bool fastboot; |
1959 | bool prefault_disable; | 1959 | bool prefault_disable; |
1960 | bool reset; | 1960 | bool reset; |
1961 | bool disable_display; | ||
1961 | }; | 1962 | }; |
1962 | extern struct i915_params i915 __read_mostly; | 1963 | extern struct i915_params i915 __read_mostly; |
1963 | 1964 | ||
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index c743057b6511..3b482585c5ae 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c | |||
@@ -47,6 +47,7 @@ struct i915_params i915 __read_mostly = { | |||
47 | .prefault_disable = 0, | 47 | .prefault_disable = 0, |
48 | .reset = true, | 48 | .reset = true, |
49 | .invert_brightness = 0, | 49 | .invert_brightness = 0, |
50 | .disable_display = 0, | ||
50 | }; | 51 | }; |
51 | 52 | ||
52 | module_param_named(modeset, i915.modeset, int, 0400); | 53 | module_param_named(modeset, i915.modeset, int, 0400); |
@@ -153,3 +154,6 @@ MODULE_PARM_DESC(invert_brightness, | |||
153 | "report PCI device ID, subsystem vendor and subsystem device ID " | 154 | "report PCI device ID, subsystem vendor and subsystem device ID " |
154 | "to dri-devel@lists.freedesktop.org, if your machine needs it. " | 155 | "to dri-devel@lists.freedesktop.org, if your machine needs it. " |
155 | "It will then be included in an upcoming module version."); | 156 | "It will then be included in an upcoming module version."); |
157 | |||
158 | module_param_named(disable_display, i915.disable_display, bool, 0600); | ||
159 | MODULE_PARM_DESC(disable_display, "Disable display (default: false)"); | ||