|
@@ -8989,6 +8989,13 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
|
|
|
u64 power_domain_mask;
|
|
|
bool active;
|
|
|
|
|
|
+ if (INTEL_GEN(dev_priv) >= 9) {
|
|
|
+ intel_crtc_init_scalers(crtc, pipe_config);
|
|
|
+
|
|
|
+ pipe_config->scaler_state.scaler_id = -1;
|
|
|
+ pipe_config->scaler_state.scaler_users &= ~(1 << SKL_CRTC_INDEX);
|
|
|
+ }
|
|
|
+
|
|
|
power_domain = POWER_DOMAIN_PIPE(crtc->pipe);
|
|
|
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
|
|
|
return false;
|
|
@@ -9017,13 +9024,6 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
|
|
|
pipe_config->gamma_mode =
|
|
|
I915_READ(GAMMA_MODE(crtc->pipe)) & GAMMA_MODE_MODE_MASK;
|
|
|
|
|
|
- if (INTEL_GEN(dev_priv) >= 9) {
|
|
|
- intel_crtc_init_scalers(crtc, pipe_config);
|
|
|
-
|
|
|
- pipe_config->scaler_state.scaler_id = -1;
|
|
|
- pipe_config->scaler_state.scaler_users &= ~(1 << SKL_CRTC_INDEX);
|
|
|
- }
|
|
|
-
|
|
|
power_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
|
|
|
if (intel_display_power_get_if_enabled(dev_priv, power_domain)) {
|
|
|
power_domain_mask |= BIT_ULL(power_domain);
|