drm/i915/display: Free crtc_state in verify_crtc_state

surajk8 · vsyrjala · commit 85c477011dd3 · 2023-10-10T21:43:57.000+03:00
Free hw_crtc_state in verify_crtc_state after we are done using this or else it's just a resource leak. Fixes: 2745bdd ("drm/i915: Stop clobbering old crtc state during state check") Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231010053208.691260-1-suraj.kandpal@intel.com
diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
@@ -214,7 +214,7 @@ verify_crtc_state(struct intel_atomic_state *state,
 	}
 
 	if (!sw_crtc_state->hw.active)
-		return;
+		goto destroy_state;
 
 	intel_pipe_config_sanity_check(hw_crtc_state);
 
@@ -224,6 +224,9 @@ verify_crtc_state(struct intel_atomic_state *state,
 		intel_crtc_state_dump(hw_crtc_state, NULL, "hw state");
 		intel_crtc_state_dump(sw_crtc_state, NULL, "sw state");
 	}
+
+destroy_state:
+	intel_crtc_destroy_state(&crtc->base, &hw_crtc_state->uapi);
 }
 
 void intel_modeset_verify_crtc(struct intel_atomic_state *state,

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ verify_crtc_state(struct intel_atomic_state *state,`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`if (!sw_crtc_state->hw.active)`
`217`		`- return;`
	`217`	`+ goto destroy_state;`
`218`	`218`
`219`	`219`	`intel_pipe_config_sanity_check(hw_crtc_state);`
`220`	`220`
`@@ -224,6 +224,9 @@ verify_crtc_state(struct intel_atomic_state *state,`
`224`	`224`	`intel_crtc_state_dump(hw_crtc_state, NULL, "hw state");`
`225`	`225`	`intel_crtc_state_dump(sw_crtc_state, NULL, "sw state");`
`226`	`226`	`}`
	`227`	`+`
	`228`	`+destroy_state:`
	`229`	`+ intel_crtc_destroy_state(&crtc->base, &hw_crtc_state->uapi);`
`227`	`230`	`}`
`228`	`231`
`229`	`232`	`void intel_modeset_verify_crtc(struct intel_atomic_state *state,`