shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "drm: fix some no need warning"

Browse Source 
This reverts commit 455796818d.
and deal with this issue by following commit:
commit 1f525e2416b3 ("drm/rockchip: reset conn->state->best_encode")

Change-Id: I239296a0a618a3034c6502ca95050dd85da7b5fe
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2020-07-16 17:46:06 +08:00
committed by Tao Huang
parent dba4fb464a
commit 6ea8daccaf
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/drm_atomic_helper.c
View File

@@ -217,12 +217,8 @@ set_best_encoder(struct drm_atomic_state *state,
* As an exception restoring duplicated atomic state
* during resume is allowed, so don't warn when
* best_encoder is equal to encoder we intend to set.
*
* As rockchip maybe appear one crtc connect two connecter,
* the conn_state->best_encoder always isn't NULL, so here no
* need warning.
*/
WARN_ON(!crtc && encoder && encoder != conn_state->best_encoder);
WARN_ON(!crtc && encoder != conn_state->best_encoder);
if (crtc) {
crtc_state = drm_atomic_get_new_crtc_state(state, crtc);