Re: [PATCH 1/2] drm/i915: Free memdup-ed bios data structures on driver_unload

[Hans de Goede <hdegoede@xxxxxxxxxx>]

Hi,

On 02-02-18 17:13, Ville Syrjälä wrote:
> On Mon, Jan 29, 2018 at 03:47:34PM +0100, Hans de Goede wrote:
> > Add a new intel_bios_cleanup function to free memdup-ed bios data
> > structures and call it from i915_driver_unload().
> >
> > Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> > ---
> >   drivers/gpu/drm/i915/i915_drv.c   |  2 ++
> >   drivers/gpu/drm/i915/i915_drv.h   |  1 +
> >   drivers/gpu/drm/i915/intel_bios.c | 11 +++++++++++
> >   3 files changed, 14 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index 1ec12add34b2..4ecf41724183 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -1437,6 +1437,8 @@ void i915_driver_unload(struct drm_device *dev)
> >   
> >   	intel_modeset_cleanup(dev);
> >   
> > +	intel_bios_cleanup(dev_priv);
> > +
> >   	/*
> >   	 * free the memory space allocated for the child device
> >   	 * config parsed from VBT
>
> Looks like there's already a bunch of VBT related cleanup just below.
> Maybe that should be sucked into the new cleanup function as well?

Ah, I somehow missed that, yes that is a good idea. I will send a v3 of
the series with that changed.

Regards,

Hans


> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 454d8f937fae..081190da0818 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -3663,6 +3663,7 @@ extern void intel_i2c_reset(struct drm_i915_private *dev_priv);
> >   
> >   /* intel_bios.c */
> >   void intel_bios_init(struct drm_i915_private *dev_priv);
> > +void intel_bios_cleanup(struct drm_i915_private *dev_priv);
> >   bool intel_bios_is_valid_vbt(const void *buf, size_t size);
> >   bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
> >   bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
> > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> > index 95f0b310d656..64a0d55df28e 100644
> > --- a/drivers/gpu/drm/i915/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > @@ -1588,6 +1588,17 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
> >   		pci_unmap_rom(pdev, bios);
> >   }
> >   
> > +/**
> > + * intel_bios_cleanup - Free any resources allocated by intel_bios_init()
> > + * @dev_priv: i915 device instance
> > + */
> > +void intel_bios_cleanup(struct drm_i915_private *dev_priv)
> > +{
> > +	kfree(dev_priv->vbt.dsi.data);
> > +	kfree(dev_priv->vbt.dsi.pps);
> > +	kfree(dev_priv->vbt.dsi.config);
> > +}
> > +
> >   /**
> >    * intel_bios_is_tv_present - is integrated TV present in VBT
> >    * @dev_priv:	i915 device instance
> > --
> > 2.14.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx