Re: [Intel-gfx] [PATCHv2] drm/i915: free crtc on driver remove

[Jani Nikula <jani.nikula@intel.com>]

On Thu, 30 Jun 2022, Arun R Murthy <arun.r.murthy@intel.com> wrote:
> intel_crtc is being allocated as part of intel_modeset_init_nogem
> and not freed as part of driver remove. This will lead to memory
> leak. Hence free up the allocated crtc on driver remove as part of
> intel_modeset_driver_remove_nogem.

No, there's no leak and this is not needed.

See drm_mode_config_cleanup() calling crtc->funcs->destroy() on each
crtc.


BR,
Jani.

>
> Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_crtc.c    | 2 +-
>  drivers/gpu/drm/i915/display/intel_crtc.h    | 1 +
>  drivers/gpu/drm/i915/display/intel_display.c | 6 ++++++
>  3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index 4442aa355f86..c90b2854c772 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -193,7 +193,7 @@ static struct intel_crtc *intel_crtc_alloc(void)
>  	return crtc;
>  }
>  
> -static void intel_crtc_free(struct intel_crtc *crtc)
> +void intel_crtc_free(struct intel_crtc *crtc)
>  {
>  	intel_crtc_destroy_state(&crtc->base, crtc->base.state);
>  	kfree(crtc);
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/i915/display/intel_crtc.h
> index 73077137fb99..d20200a2c33b 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.h
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.h
> @@ -35,5 +35,6 @@ struct intel_crtc *intel_crtc_for_pipe(struct drm_i915_private *i915,
>  void intel_wait_for_vblank_if_active(struct drm_i915_private *i915,
>  				     enum pipe pipe);
>  void intel_crtc_wait_for_next_vblank(struct intel_crtc *crtc);
> +void intel_crtc_free(struct intel_crtc *crtc);
>  
>  #endif
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index a0f84cbe974f..33e29455fe56 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -9046,6 +9046,8 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>  /* part #3: call after gem init */
>  void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
>  {
> +	struct intel_crtc *crtc;
> +
>  	intel_dmc_ucode_fini(i915);
>  
>  	intel_power_domains_driver_remove(i915);
> @@ -9053,6 +9055,10 @@ void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
>  	intel_vga_unregister(i915);
>  
>  	intel_bios_driver_remove(i915);
> +
> +	/* Free the allocated crtc */
> +	for_each_intel_crtc(&i915->drm, crtc)
> +		intel_crtc_free(crtc);
>  }
>  
>  bool intel_modeset_probe_defer(struct pci_dev *pdev)

-- 
Jani Nikula, Intel Open Source Graphics Center