Skip to content

Commit 1cb19e8

Browse files
Harry Wentlandalexdeucher
authored andcommitted
Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)"
This seems to cause flickering and lock-ups for a wide range of users. Revert until we've found a proper fix for the flickering and lock-ups. This reverts commit 36cc549. Cc: Shirish S <[email protected]> Cc: Alex Deucher <[email protected]> Cc: [email protected] Reviewed-by: Michel Dänzer <[email protected]> Signed-off-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1bc8ffb commit 1cb19e8

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4848,30 +4848,6 @@ static int dm_update_planes_state(struct dc *dc,
48484848
return ret;
48494849
}
48504850

4851-
static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,
4852-
struct drm_crtc *crtc)
4853-
{
4854-
struct drm_plane *plane;
4855-
struct drm_crtc_state *crtc_state;
4856-
4857-
WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
4858-
4859-
drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
4860-
struct drm_plane_state *plane_state =
4861-
drm_atomic_get_plane_state(state, plane);
4862-
4863-
if (IS_ERR(plane_state))
4864-
return -EDEADLK;
4865-
4866-
crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);
4867-
if (crtc->primary == plane && crtc_state->active) {
4868-
if (!plane_state->fb)
4869-
return -EINVAL;
4870-
}
4871-
}
4872-
return 0;
4873-
}
4874-
48754851
static int amdgpu_dm_atomic_check(struct drm_device *dev,
48764852
struct drm_atomic_state *state)
48774853
{
@@ -4895,10 +4871,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
48954871
goto fail;
48964872

48974873
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
4898-
ret = dm_atomic_check_plane_state_fb(state, crtc);
4899-
if (ret)
4900-
goto fail;
4901-
49024874
if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
49034875
!new_crtc_state->color_mgmt_changed)
49044876
continue;

0 commit comments

Comments
 (0)