diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
| commit | 1cfb9d628fa24c0a8b24cd604ae62dfa10a0d716 (patch) | |
| tree | 4e57e7465ce5fbc2a6cc838fd78e5e8a2b9799ff /drivers/gpu/drm/drm_atomic.c | |
| parent | d595150285cf886cf2399fd74b0eeb43b444c706 (diff) | |
| parent | 7ecc9777c5c76d7b31c376ffd4f59c4a85472a1b (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into v4.9/topic/ionv4.9/topic/ion
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 4e19bde4bbff..34adde169a78 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1386,6 +1386,9 @@ int drm_atomic_check_only(struct drm_atomic_state *state) if (config->funcs->atomic_check) ret = config->funcs->atomic_check(state->dev, state); + if (ret) + return ret; + if (!state->allow_modeset) { for_each_crtc_in_state(state, crtc, crtc_state, i) { if (drm_atomic_crtc_needs_modeset(crtc_state)) { @@ -1396,7 +1399,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) } } - return ret; + return 0; } EXPORT_SYMBOL(drm_atomic_check_only); |