@@ -1160,15 +1160,15 @@ crtc_needs_disable(struct drm_crtc_state *old_state,
1160
1160
}
1161
1161
1162
1162
static void
1163
- disable_outputs (struct drm_device * dev , struct drm_atomic_state * old_state )
1163
+ disable_outputs (struct drm_device * dev , struct drm_atomic_state * state )
1164
1164
{
1165
1165
struct drm_connector * connector ;
1166
1166
struct drm_connector_state * old_conn_state , * new_conn_state ;
1167
1167
struct drm_crtc * crtc ;
1168
1168
struct drm_crtc_state * old_crtc_state , * new_crtc_state ;
1169
1169
int i ;
1170
1170
1171
- for_each_oldnew_connector_in_state (old_state , connector , old_conn_state , new_conn_state , i ) {
1171
+ for_each_oldnew_connector_in_state (state , connector , old_conn_state , new_conn_state , i ) {
1172
1172
const struct drm_encoder_helper_funcs * funcs ;
1173
1173
struct drm_encoder * encoder ;
1174
1174
struct drm_bridge * bridge ;
@@ -1180,11 +1180,11 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
1180
1180
if (!old_conn_state -> crtc )
1181
1181
continue ;
1182
1182
1183
- old_crtc_state = drm_atomic_get_old_crtc_state (old_state , old_conn_state -> crtc );
1183
+ old_crtc_state = drm_atomic_get_old_crtc_state (state , old_conn_state -> crtc );
1184
1184
1185
1185
if (new_conn_state -> crtc )
1186
1186
new_crtc_state = drm_atomic_get_new_crtc_state (
1187
- old_state ,
1187
+ state ,
1188
1188
new_conn_state -> crtc );
1189
1189
else
1190
1190
new_crtc_state = NULL ;
@@ -1211,12 +1211,12 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
1211
1211
* it away), so we won't call disable hooks twice.
1212
1212
*/
1213
1213
bridge = drm_bridge_chain_get_first_bridge (encoder );
1214
- drm_atomic_bridge_chain_disable (bridge , old_state );
1214
+ drm_atomic_bridge_chain_disable (bridge , state );
1215
1215
1216
1216
/* Right function depends upon target state. */
1217
1217
if (funcs ) {
1218
1218
if (funcs -> atomic_disable )
1219
- funcs -> atomic_disable (encoder , old_state );
1219
+ funcs -> atomic_disable (encoder , state );
1220
1220
else if (new_conn_state -> crtc && funcs -> prepare )
1221
1221
funcs -> prepare (encoder );
1222
1222
else if (funcs -> disable )
@@ -1225,10 +1225,10 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
1225
1225
funcs -> dpms (encoder , DRM_MODE_DPMS_OFF );
1226
1226
}
1227
1227
1228
- drm_atomic_bridge_chain_post_disable (bridge , old_state );
1228
+ drm_atomic_bridge_chain_post_disable (bridge , state );
1229
1229
}
1230
1230
1231
- for_each_oldnew_crtc_in_state (old_state , crtc , old_crtc_state , new_crtc_state , i ) {
1231
+ for_each_oldnew_crtc_in_state (state , crtc , old_crtc_state , new_crtc_state , i ) {
1232
1232
const struct drm_crtc_helper_funcs * funcs ;
1233
1233
int ret ;
1234
1234
@@ -1249,7 +1249,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
1249
1249
if (new_crtc_state -> enable && funcs -> prepare )
1250
1250
funcs -> prepare (crtc );
1251
1251
else if (funcs -> atomic_disable )
1252
- funcs -> atomic_disable (crtc , old_state );
1252
+ funcs -> atomic_disable (crtc , state );
1253
1253
else if (funcs -> disable )
1254
1254
funcs -> disable (crtc );
1255
1255
else if (funcs -> dpms )
0 commit comments