From: Maarten Lankhorst Date: Wed, 16 May 2018 08:50:38 +0000 (+0200) Subject: drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder, v2. X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d6cae4aa30ce551dfa2872f793f64d39719da6b7;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder, v2. Normally this is called on a modeset, but the call is missing when we inherit the mode from the BIOS, so make sure it's called somewhere in hardware readout. Changes since v1: - Unconditionally call intel_opregion_notify_encoder. (Ville) Signed-off-by: Maarten Lankhorst Cc: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180516085038.36785-1-maarten.lankhorst@linux.intel.com Reviewed-by: Ville Syrjälä --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8d4c9e249c44..da251ff6aca9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15251,6 +15251,9 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) connector->base.dpms = DRM_MODE_DPMS_OFF; connector->base.encoder = NULL; } + + /* notify opregion of the sanitized encoder state */ + intel_opregion_notify_encoder(encoder, connector && has_active_crtc); } void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)