|
@@ -4796,6 +4796,30 @@ static int dm_update_planes_state(struct dc *dc,
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,
|
|
|
|
+ struct drm_crtc *crtc)
|
|
|
|
+{
|
|
|
|
+ struct drm_plane *plane;
|
|
|
|
+ struct drm_crtc_state *crtc_state;
|
|
|
|
+
|
|
|
|
+ WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
|
|
|
|
+
|
|
|
|
+ drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
|
|
|
|
+ struct drm_plane_state *plane_state =
|
|
|
|
+ drm_atomic_get_plane_state(state, plane);
|
|
|
|
+
|
|
|
|
+ if (IS_ERR(plane_state))
|
|
|
|
+ return -EDEADLK;
|
|
|
|
+
|
|
|
|
+ crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);
|
|
|
|
+ if (crtc->primary == plane && crtc_state->active) {
|
|
|
|
+ if (!plane_state->fb)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
static int amdgpu_dm_atomic_check(struct drm_device *dev,
|
|
static int amdgpu_dm_atomic_check(struct drm_device *dev,
|
|
struct drm_atomic_state *state)
|
|
struct drm_atomic_state *state)
|
|
{
|
|
{
|
|
@@ -4819,6 +4843,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
|
|
goto fail;
|
|
goto fail;
|
|
|
|
|
|
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
|
|
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
|
|
|
|
+ ret = dm_atomic_check_plane_state_fb(state, crtc);
|
|
|
|
+ if (ret)
|
|
|
|
+ goto fail;
|
|
|
|
+
|
|
if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
|
|
if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
|
|
!new_crtc_state->color_mgmt_changed)
|
|
!new_crtc_state->color_mgmt_changed)
|
|
continue;
|
|
continue;
|