|
@@ -9860,10 +9860,8 @@ retry:
|
|
fail:
|
|
fail:
|
|
intel_crtc->new_enabled = crtc->state->enable;
|
|
intel_crtc->new_enabled = crtc->state->enable;
|
|
fail_unlock:
|
|
fail_unlock:
|
|
- if (state) {
|
|
|
|
- drm_atomic_state_free(state);
|
|
|
|
- state = NULL;
|
|
|
|
- }
|
|
|
|
|
|
+ drm_atomic_state_free(state);
|
|
|
|
+ state = NULL;
|
|
|
|
|
|
if (ret == -EDEADLK) {
|
|
if (ret == -EDEADLK) {
|
|
drm_modeset_backoff(ctx);
|
|
drm_modeset_backoff(ctx);
|
|
@@ -13003,8 +13001,7 @@ fail:
|
|
}
|
|
}
|
|
|
|
|
|
out_config:
|
|
out_config:
|
|
- if (state)
|
|
|
|
- drm_atomic_state_free(state);
|
|
|
|
|
|
+ drm_atomic_state_free(state);
|
|
|
|
|
|
intel_set_config_free(config);
|
|
intel_set_config_free(config);
|
|
return ret;
|
|
return ret;
|