diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2018-06-08 15:33:29 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-06-11 10:21:18 +0300 |
| commit | 13d0464b3240429234c34b39b819fe6f088fc3c8 (patch) | |
| tree | 5bc617d0646652b6643ed2f3a8ab2442572e444d /drivers/gpu/drm/i915/intel_bios.c | |
| parent | drm/i915: clean up virtual PCH special case handling (diff) | |
| download | linux-dev-13d0464b3240429234c34b39b819fe6f088fc3c8.tar.xz linux-dev-13d0464b3240429234c34b39b819fe6f088fc3c8.zip | |
drm/i915: be more strict about HAS_PCH_NOP() usage
HAS_PCH_NOP() implies a PCH platform without south display, not generic
disabled display. Prefer num_pipes == 0 for PCH independent checks.
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180608123330.31003-5-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 465dff4780fe..18b9e0444116 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1719,7 +1719,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv) const struct bdb_header *bdb; u8 __iomem *bios = NULL; - if (HAS_PCH_NOP(dev_priv)) { + if (INTEL_INFO(dev_priv)->num_pipes == 0) { DRM_DEBUG_KMS("Skipping VBT init due to disabled display.\n"); return; } |