samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions Packages Projects 릴리즈 위키 활동

Merge "drm/msm/sde: fix invalid connector state in crtc check" into display-kernel.lnx.5.4

소스 검색
This commit is contained in:
Linux Build Service Account
2020-07-17 15:14:51 -07:00
committed by Gerrit - the friendly Code Review server
부모 de02324782 1c83659a56
커밋 a585d8a7d2
1개의 변경된 파일과 4개의 추가작업 그리고 7개의 파일을 삭제
Download Patch File Download Diff File Expand all files Collapse all files

11
msm/sde/sde_crtc.c
파일 보기

@@ -4875,7 +4875,6 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,
struct sde_multirect_plane_states *multirect_plane = NULL; struct sde_multirect_plane_states *multirect_plane = NULL;
struct drm_connector *conn; struct drm_connector *conn;
struct drm_connector_list_iter conn_iter; struct drm_connector_list_iter conn_iter;
struct drm_connector_state *conn_state;
if (!crtc) { if (!crtc) {
SDE_ERROR("invalid crtc\n"); SDE_ERROR("invalid crtc\n");
@@ -4913,15 +4912,13 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,
/* identify connectors attached to this crtc */ /* identify connectors attached to this crtc */
cstate->num_connectors = 0; cstate->num_connectors = 0;
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(conn, &conn_iter) {
conn_state = drm_atomic_get_connector_state(state->state, conn);
if (conn_state && conn_state->crtc == crtc && drm_connector_list_iter_begin(dev, &conn_iter);
cstate->num_connectors < MAX_CONNECTORS) { drm_for_each_connector_iter(conn, &conn_iter)
if ((state->connector_mask & (1 << drm_connector_index(conn)))
&& cstate->num_connectors < MAX_CONNECTORS) {
cstate->connectors[cstate->num_connectors++] = conn; cstate->connectors[cstate->num_connectors++] = conn;
} }
}
drm_connector_list_iter_end(&conn_iter); drm_connector_list_iter_end(&conn_iter);
rc = _sde_crtc_check_dest_scaler_data(crtc, state); rc = _sde_crtc_check_dest_scaler_data(crtc, state);