diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0578-drm-amd-display-Add-correct-retain-release.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/0578-drm-amd-display-Add-correct-retain-release.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0578-drm-amd-display-Add-correct-retain-release.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0578-drm-amd-display-Add-correct-retain-release.patch new file mode 100644 index 00000000..b818f1f8 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0578-drm-amd-display-Add-correct-retain-release.patch @@ -0,0 +1,79 @@ +From 52232aebaf878672c4f13abc108260e5293da073 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Fri, 3 Mar 2017 14:50:00 -0500 +Subject: [PATCH 0578/4131] drm/amd/display: Add correct retain/release + +Needed by objs in dm_atomic_state + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++++++++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 6 ++++++ + 2 files changed, 16 insertions(+) + +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 1b69848..c2a6f2e 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -658,9 +658,19 @@ void dm_atomic_state_clear(struct drm_atomic_state *s) + static void dm_atomic_state_free(struct drm_atomic_state *state) + { + struct dm_atomic_state *dm_state = to_dm_atomic_state(state); ++ int i, j; + + drm_atomic_state_default_release(state); + ++ for (i = 0; i < dm_state->set_count; i++) { ++ for (j = 0; j < dm_state->set[i].surface_count; j++) { ++ dc_surface_release(dm_state->set[i].surfaces[j]); ++ } ++ } ++ ++ for (i = 0; i < dm_state->set_count; i++) ++ dc_stream_release(dm_state->set[i].stream); ++ + kfree(dm_state); + } + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +index ffa4eeb..716b440 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +@@ -3019,11 +3019,15 @@ static uint32_t update_in_val_sets_stream( + } + + val_sets[i].stream = new_stream; ++ dc_stream_retain(new_stream); + crtcs[i] = crtc; + + if (i == set_count) { + /* nothing found. add new one to the end */ + return set_count + 1; ++ } else { ++ /* update. relase old stream */ ++ dc_stream_release(old_stream); + } + + return set_count; +@@ -3045,6 +3049,7 @@ static uint32_t remove_from_val_sets( + return set_count; + } + ++ dc_stream_release(stream); + set_count--; + + for (; i < set_count; i++) { +@@ -3149,6 +3154,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, + struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); + + if (acrtc->stream) { ++ dc_stream_retain(acrtc->stream); + dm_state->set[dm_state->set_count].stream = acrtc->stream; + crtc_set[dm_state->set_count] = crtc; + ++dm_state->set_count; +-- +2.7.4 + |