diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
| commit | 8e22e1b3499a446df48c2b26667ca36c55bf864c (patch) | |
| tree | 5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | 00d3c14f14d51babd8aeafd5fa734ccf04f5ca3d (diff) | |
| parent | 64a577196d66b44e37384bc5c4d78c61f59d5b2a (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 5d9830f6a190..9203f3e933f7 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c | |||
| @@ -370,7 +370,7 @@ mode_fixup(struct drm_atomic_state *state) | |||
| 370 | struct drm_connector *connector; | 370 | struct drm_connector *connector; |
| 371 | struct drm_connector_state *conn_state; | 371 | struct drm_connector_state *conn_state; |
| 372 | int i; | 372 | int i; |
| 373 | bool ret; | 373 | int ret; |
| 374 | 374 | ||
| 375 | for_each_crtc_in_state(state, crtc, crtc_state, i) { | 375 | for_each_crtc_in_state(state, crtc, crtc_state, i) { |
| 376 | if (!crtc_state->mode_changed && | 376 | if (!crtc_state->mode_changed && |