diff options
| author |   Rob Clark <robdclark@gmail.com> | 2014-11-19 16:41:33 -0500 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-11-21 16:06:10 -0500 |
| commit | 934ce1c23624526d9d784e0499190bb48113e6f4 (patch) | |
| tree | d3368258c45e5b1d85bfd3ebbf83375e7637e08d /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | drm/msm/mdp4: fix mixer setup for multi-crtc + planes (diff) | |
| download | linux-dev-934ce1c23624526d9d784e0499190bb48113e6f4.tar.xz linux-dev-934ce1c23624526d9d784e0499190bb48113e6f4.zip | |
drm/atomic: check mode_changed *after* atomic_check
The intention is that drivers can set crtc_state->mode_changed in their
atomic_check() fxns if they encounter a scenario that requires full
modeset.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 690360038dc1..3a74e81a78df 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -331,7 +331,7 @@ mode_fixup(struct drm_atomic_state *state) } static int -drm_atomic_helper_check_prepare(struct drm_device *dev, +drm_atomic_helper_check_modeset(struct drm_device *dev, struct drm_atomic_state *state) { int ncrtcs = dev->mode_config.num_crtc; @@ -428,10 +428,6 @@ int drm_atomic_helper_check(struct drm_device *dev, int ncrtcs = dev->mode_config.num_crtc; int i, ret = 0; - ret = drm_atomic_helper_check_prepare(dev, state); - if (ret) - return ret; - for (i = 0; i < nplanes; i++) { struct drm_plane_helper_funcs *funcs; struct drm_plane *plane = state->planes[i]; @@ -475,6 +471,10 @@ int drm_atomic_helper_check(struct drm_device *dev, } } + ret = drm_atomic_helper_check_modeset(dev, state); + if (ret) + return ret; + return ret; } EXPORT_SYMBOL(drm_atomic_helper_check); |