Skip to content

Commit

Permalink
drm/i915: Only skip connector output for disable_display
Browse files Browse the repository at this point in the history
We want to add no connectors, encoders or crtcs if the display is
disabled, but we still need to hook up any existing HW so that we can
power it down.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180815201207.2203-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Aug 15, 2018
1 parent ad3c776 commit fc0c5a9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -14128,6 +14128,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)

intel_pps_init(dev_priv);

if (INTEL_INFO(dev_priv)->num_pipes == 0)
return;

/*
* intel_edp_init_connector() depends on this completing first, to
* prevent the registeration of both eDP and LVDS and the incorrect
Expand Down Expand Up @@ -15206,9 +15209,6 @@ int intel_modeset_init(struct drm_device *dev)

intel_init_pm(dev_priv);

if (INTEL_INFO(dev_priv)->num_pipes == 0)
return 0;

/*
* There may be no VBT; and if the BIOS enabled SSC we can
* just keep using it to avoid unnecessary flicker. Whereas if the
Expand Down

0 comments on commit fc0c5a9

Please sign in to comment.