aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch74
1 files changed, 74 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch
new file mode 100644
index 00000000..f1427747
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0607-drm-amd-display-Release-dm_state-context-when-state-.patch
@@ -0,0 +1,74 @@
+From c456d3f168c2a36a8d6ab3f895ceb99a65634b7b Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Date: Tue, 11 Jul 2017 14:42:57 -0400
+Subject: [PATCH 0607/4131] drm/amd/display: Release dm_state->context when
+ state is cleared.
+
+Handling a use case of TEST_ONLY request from DRM where commit is
+not goiing to be called. We need to release the allocated dc_validate_context
+in this case.
+
+Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@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 | 23 ++++++++++++++++++++++
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 1 +
+ 2 files changed, 24 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 88e177e..b6a04ad 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -653,12 +653,35 @@ dm_atomic_state_alloc(struct drm_device *dev)
+ return &state->base;
+ }
+
++static void
++dm_atomic_state_clear(struct drm_atomic_state *state)
++{
++ struct dm_atomic_state *dm_state = to_dm_atomic_state(state);
++
++ if (dm_state->context) {
++ dc_release_validate_context(dm_state->context);
++ dm_state->context = NULL;
++ }
++
++ drm_atomic_state_default_clear(state);
++}
++
++static void
++dm_atomic_state_alloc_free(struct drm_atomic_state *state)
++{
++ struct dm_atomic_state *dm_state = to_dm_atomic_state(state);
++ drm_atomic_state_default_release(state);
++ kfree(dm_state);
++}
++
+ static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = {
+ .fb_create = amdgpu_user_framebuffer_create,
+ .output_poll_changed = amdgpu_output_poll_changed,
+ .atomic_check = amdgpu_dm_atomic_check,
+ .atomic_commit = amdgpu_dm_atomic_commit,
+ .atomic_state_alloc = dm_atomic_state_alloc,
++ .atomic_state_clear = dm_atomic_state_clear,
++ .atomic_state_free = dm_atomic_state_alloc_free
+ };
+
+ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {
+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 534e270..7f57017 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
+@@ -3293,6 +3293,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
+ if (ret)
+ goto fail_planes;
+
++ WARN_ON(dm_state->context);
+ dm_state->context = dc_get_validate_context(dc, set, set_count);
+ if (!dm_state->context) {
+ ret = -EINVAL;
+--
+2.7.4
+