diff options
| author | Dave Airlie <[email protected]> | 2019-06-06 01:56:00 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-06-06 01:57:13 +0000 |
| commit | dbd9f78ed23746e9708f773224eec2c8b33206e7 (patch) | |
| tree | c3402e3caf21d9636f3d241d819b536adb0fd735 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | udmabuf: actually unmap the scatterlist (diff) | |
| download | kernel-dbd9f78ed23746e9708f773224eec2c8b33206e7.tar.gz kernel-dbd9f78ed23746e9708f773224eec2c8b33206e7.zip | |
Merge tag 'drm-misc-fixes-2019-06-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- Allow fb changes in async commits (fixes igt failures) (Helen)
- Actually unmap the scatterlist when unmapping udmabuf (Lucas)
Cc: Lucas Stach <[email protected]>
Cc: Helen Koike <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
From: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605210335.GA35431@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index bcb1a93c0b4c..ab7c5c3004ee 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4232,8 +4232,7 @@ static void dm_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(new_state->state, plane); - if (plane->state->fb != new_state->fb) - drm_atomic_set_fb_for_plane(plane->state, new_state->fb); + swap(plane->state->fb, new_state->fb); plane->state->src_x = new_state->src_x; plane->state->src_y = new_state->src_y; |