@@ -4051,20 +4051,19 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
4051
4051
struct intel_crtc_state * pipe_config )
4052
4052
{
4053
4053
struct drm_i915_private * dev_priv = to_i915 (crtc -> base .dev );
4054
- struct intel_display_power_domain_set power_domain_set = { };
4055
4054
bool active ;
4056
4055
u32 tmp ;
4057
4056
4058
- if (!intel_display_power_get_in_set_if_enabled (dev_priv , & power_domain_set ,
4057
+ if (!intel_display_power_get_in_set_if_enabled (dev_priv , & crtc -> hw_readout_power_domains ,
4059
4058
POWER_DOMAIN_PIPE (crtc -> pipe )))
4060
4059
return false;
4061
4060
4062
4061
pipe_config -> shared_dpll = NULL ;
4063
4062
4064
- active = hsw_get_transcoder_state (crtc , pipe_config , & power_domain_set );
4063
+ active = hsw_get_transcoder_state (crtc , pipe_config , & crtc -> hw_readout_power_domains );
4065
4064
4066
4065
if ((IS_GEMINILAKE (dev_priv ) || IS_BROXTON (dev_priv )) &&
4067
- bxt_get_dsi_transcoder_state (crtc , pipe_config , & power_domain_set )) {
4066
+ bxt_get_dsi_transcoder_state (crtc , pipe_config , & crtc -> hw_readout_power_domains )) {
4068
4067
drm_WARN_ON (& dev_priv -> drm , active );
4069
4068
active = true;
4070
4069
}
@@ -4123,7 +4122,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
4123
4122
pipe_config -> ips_linetime =
4124
4123
REG_FIELD_GET (HSW_IPS_LINETIME_MASK , tmp );
4125
4124
4126
- if (intel_display_power_get_in_set_if_enabled (dev_priv , & power_domain_set ,
4125
+ if (intel_display_power_get_in_set_if_enabled (dev_priv , & crtc -> hw_readout_power_domains ,
4127
4126
POWER_DOMAIN_PIPE_PANEL_FITTER (crtc -> pipe ))) {
4128
4127
if (DISPLAY_VER (dev_priv ) >= 9 )
4129
4128
skl_get_pfit_config (pipe_config );
@@ -4154,7 +4153,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
4154
4153
}
4155
4154
4156
4155
out :
4157
- intel_display_power_put_all_in_set (dev_priv , & power_domain_set );
4156
+ intel_display_power_put_all_in_set (dev_priv , & crtc -> hw_readout_power_domains );
4158
4157
4159
4158
return active ;
4160
4159
}
0 commit comments