| Message ID | 20231010053208.691260-1-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: Free crtc_state in verify_crtc_state | expand |
On Tue, Oct 10, 2023 at 11:02:09AM +0530, Suraj Kandpal wrote: > Free hw_crtc_state in verify_crtc_state after we are done using > this or else it's just a resource leak. > > Fixes: 2745bdda2095 ("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> Thanks. Pushed to din. > --- > drivers/gpu/drm/i915/display/intel_modeset_verify.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > index 303eb68fec11..5e1c2c780412 100644 > --- 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, > -- > 2.25.1
diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c index 303eb68fec11..5e1c2c780412 100644 --- 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,
Free hw_crtc_state in verify_crtc_state after we are done using this or else it's just a resource leak. Fixes: 2745bdda2095 ("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> --- drivers/gpu/drm/i915/display/intel_modeset_verify.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)