|
|
@@ -16294,7 +16294,7 @@ retry:
|
|
|
* BIOS-programmed watermarks untouched and hope for the best.
|
|
|
*/
|
|
|
WARN(true, "Could not determine valid watermarks for inherited state\n");
|
|
|
- goto fail;
|
|
|
+ goto put_state;
|
|
|
}
|
|
|
|
|
|
/* Write calculated watermark values back */
|
|
|
@@ -16305,8 +16305,9 @@ retry:
|
|
|
dev_priv->display.optimize_watermarks(cs);
|
|
|
}
|
|
|
|
|
|
-fail:
|
|
|
+put_state:
|
|
|
drm_atomic_state_put(state);
|
|
|
+fail:
|
|
|
drm_modeset_drop_locks(&ctx);
|
|
|
drm_modeset_acquire_fini(&ctx);
|
|
|
}
|