Skip to content

Commit 3c354ed

Browse files
committed
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: dcda7c2 ("drm/vc4: kms: Add functions to create the state objects") Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20201105135656.383350-2-maxime@cerno.tech
1 parent 57fb32e commit 3c354ed

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/vc4/vc4_kms.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static int vc4_ctm_obj_init(struct vc4_dev *vc4)
113113
drm_atomic_private_obj_init(&vc4->base, &vc4->ctm_manager, &ctm_state->base,
114114
&vc4_ctm_state_funcs);
115115

116-
return drmm_add_action(&vc4->base, vc4_ctm_obj_fini, NULL);
116+
return drmm_add_action_or_reset(&vc4->base, vc4_ctm_obj_fini, NULL);
117117
}
118118

119119
/* 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)
657657
&load_state->base,
658658
&vc4_load_tracker_state_funcs);
659659

660-
return drmm_add_action(&vc4->base, vc4_load_tracker_obj_fini, NULL);
660+
return drmm_add_action_or_reset(&vc4->base, vc4_load_tracker_obj_fini, NULL);
661661
}
662662

663663
#define NUM_OUTPUTS 6

0 commit comments

Comments
 (0)