.. | .. |
---|
1113 | 1113 | continue; |
---|
1114 | 1114 | |
---|
1115 | 1115 | 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"); |
---|
1117 | 1126 | if (ret == 0) |
---|
1118 | 1127 | drm_crtc_vblank_put(crtc); |
---|
1119 | 1128 | } |
---|
.. | .. |
---|
3554 | 3563 | replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); |
---|
3555 | 3564 | replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); |
---|
3556 | 3565 | 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 |
---|
3560 | 3566 | crtc_state->color_mgmt_changed |= replaced; |
---|
3561 | 3567 | |
---|
3562 | 3568 | ret = drm_atomic_commit(state); |
---|