aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Rawat <drawat@vmware.com>2018-12-21 14:35:59 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-12-24 05:53:50 -0500
commitc75ff001f4fe21a8c9f15aad799a8949aea109f7 (patch)
treec1fd1a17bc42cf75e0bbcb2f7d3ab98a47fb6742
parentcbdd2663f4c801ad93f7111f93d9846589a0d530 (diff)
drm: Put damage blob when destroy plane state
Somehow the code to put the damage blob on destroy plane state and set the blob to NULL when duplicate plane state was not merged. May be because the files are refactored since the patch was written. With this fix add those. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Deepak Rawat <drawat@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Fixes: d3b21767821e ("drm: Add a new plane property to send damage during plane update") Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20181221193559.4346-1-drawat@vmware.com
-rw-r--r--drivers/gpu/drm/drm_atomic_state_helper.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
index 60bd7d708e35..4985384e51f6 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -241,6 +241,7 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
241 241
242 state->fence = NULL; 242 state->fence = NULL;
243 state->commit = NULL; 243 state->commit = NULL;
244 state->fb_damage_clips = NULL;
244} 245}
245EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state); 246EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);
246 247
@@ -285,6 +286,8 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)
285 286
286 if (state->commit) 287 if (state->commit)
287 drm_crtc_commit_put(state->commit); 288 drm_crtc_commit_put(state->commit);
289
290 drm_property_blob_put(state->fb_damage_clips);
288} 291}
289EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state); 292EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);
290 293