drm: Put damage blob when destroy plane state (c75ff001) · Commits · 戴 / test

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: ("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

drivers/gpu/drm/drm_atomic_state_helper.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -241,6 +241,7 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,

	state->fence = NULL;		state->fence = NULL;
	state->commit = NULL;		state->commit = NULL;
			state->fb_damage_clips = NULL;
	}		}
	EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);		EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state);

	@@ -285,6 +286,8 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)

	if (state->commit)		if (state->commit)
	drm_crtc_commit_put(state->commit);		drm_crtc_commit_put(state->commit);

			drm_property_blob_put(state->fb_damage_clips);
	}		}
	EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);		EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);

Admin message