diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-12 10:13:32 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-13 09:46:37 +0200 |
| commit | 2d705c0b367622d382d80c38240b3069c19f4eeb (patch) | |
| tree | bb048fbc6c13ed696606518e03c8563c928f899d | |
| parent | dfb8bb3bd4bbb6c525ee1baa202eae01aa305109 (diff) | |
| download | linux-stable-2d705c0b367622d382d80c38240b3069c19f4eeb.tar.gz linux-stable-2d705c0b367622d382d80c38240b3069c19f4eeb.tar.bz2 linux-stable-2d705c0b367622d382d80c38240b3069c19f4eeb.zip | |
drm/atomic: Use new iterator macros in drm_atomic_helper_wait_for_flip_done
for_each_obj_in_state is about to be removed, so use the correct new
iterator macro.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Link: http://patchwork.freedesktop.org/patch/msgid/20170712081344.25495-5-maarten.lankhorst@linux.intel.com
[mlankhorst: Based on danvet's feedback, only apply first hunk and rename crtc_state variable to unused]
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 391cd887f922..0fed20692df4 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1266,11 +1266,11 @@ EXPORT_SYMBOL(drm_atomic_helper_wait_for_vblanks); void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev, struct drm_atomic_state *old_state) { - struct drm_crtc_state *crtc_state; + struct drm_crtc_state *unused; struct drm_crtc *crtc; int i; - for_each_crtc_in_state(old_state, crtc, crtc_state, i) { + for_each_crtc_in_state(old_state, crtc, unused, i) { struct drm_crtc_commit *commit = old_state->crtcs[i].commit; int ret; |