diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-10 23:04:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-10 23:04:06 -0700 |
| commit | 3a360dc1730143b82571c3336e6b7469b6c2da91 (patch) | |
| tree | 036cf6dd895cb90b73d68e470eb5171631a8f0e3 | |
| parent | e1fb82e224e0fa3eda36ba25aed0747cc463ab33 (diff) | |
| parent | a198b6cdd10e8af96b1b934796a7751cccfb2767 (diff) | |
Merge "drm/msm/sde: avoid adding plane states in crtc atomic check"
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_crtc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c index 41322045ced3..adfe9e54e6f4 100644 --- a/drivers/gpu/drm/msm/sde/sde_crtc.c +++ b/drivers/gpu/drm/msm/sde/sde_crtc.c @@ -1134,12 +1134,12 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc, /* get plane state for all drm planes associated with crtc state */ drm_atomic_crtc_state_for_each_plane(plane, state) { - pstate = drm_atomic_get_plane_state(state->state, plane); + pstate = drm_atomic_get_existing_plane_state( + state->state, plane); if (IS_ERR_OR_NULL(pstate)) { - rc = PTR_ERR(pstate); - SDE_ERROR("%s: failed to get plane%d state, %d\n", + SDE_DEBUG("%s: failed to get plane%d state, %d\n", sde_crtc->name, plane->base.id, rc); - goto end; + continue; } if (cnt >= ARRAY_SIZE(pstates)) continue; |