hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/gpu/drm/drm_atomic_helper.c
....@@ -1113,7 +1113,16 @@
11131113 continue;
11141114
11151115 ret = drm_crtc_vblank_get(crtc);
1116
- WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
1116
+ /*
1117
+ * Self-refresh is not a true "disable"; ensure vblank remains
1118
+ * enabled.
1119
+ */
1120
+ if (new_crtc_state->self_refresh_active)
1121
+ WARN_ONCE(ret != 0,
1122
+ "driver disabled vblank in self-refresh\n");
1123
+ else
1124
+ WARN_ONCE(ret != -EINVAL,
1125
+ "driver forgot to call drm_crtc_vblank_off()\n");
11171126 if (ret == 0)
11181127 drm_crtc_vblank_put(crtc);
11191128 }
....@@ -3554,9 +3563,6 @@
35543563 replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL);
35553564 replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL);
35563565 replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob);
3557
-#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT)
3558
- replaced |= drm_property_replace_blob(&crtc_state->cubic_lut, NULL);
3559
-#endif
35603566 crtc_state->color_mgmt_changed |= replaced;
35613567
35623568 ret = drm_atomic_commit(state);