Unverified Commit 3c354ed1 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: kms: Switch to drmm_add_action_or_reset 



Even though it was pointed in the review by Daniel, and I thought to have
fixed it while applying the patches, but it turns out I forgot to commit
the fixes in the process. Properly fix it this time.

Fixes: dcda7c28 ("drm/vc4: kms: Add functions to create the state objects")
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105135656.383350-2-maxime@cerno.tech
parent 57fb32e6

drivers/gpu/drm/vc4/vc4_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int vc4_ctm_obj_init(struct vc4_dev *vc4) 
	drm_atomic_private_obj_init(&vc4->base, &vc4->ctm_manager, &ctm_state->base,

				    &vc4_ctm_state_funcs);



	return drmm_add_action(&vc4->base, vc4_ctm_obj_fini, NULL);

	return drmm_add_action_or_reset(&vc4->base, vc4_ctm_obj_fini, NULL);

}



/* Converts a DRM S31.32 value to the HW S0.9 format. */
@@ -657,7 +657,7 @@ static int vc4_load_tracker_obj_init(struct vc4_dev *vc4) 
				    &load_state->base,

				    &vc4_load_tracker_state_funcs);



	return drmm_add_action(&vc4->base, vc4_load_tracker_obj_fini, NULL);

	return drmm_add_action_or_reset(&vc4->base, vc4_load_tracker_obj_fini, NULL);

}



#define NUM_OUTPUTS  6