[PATCH v4 1/3] drm/i915: Add intel_bios_cleanup() function

[Hans de Goede]

Hi,

On 12-02-18 20:45, Ville Syrjälä wrote:
> On Tue, Feb 06, 2018 at 03:12:37PM +0100, Hans de Goede wrote:
>> Add an intel_bios_cleanup() function to act as counterpart of
>> intel_bios_init() and move the cleanup of vbt related resources there,
>> putting it in the same file as the allocation.
>>
>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>> ---
>>   drivers/gpu/drm/i915/i915_drv.c   | 14 +-------------
>>   drivers/gpu/drm/i915/i915_drv.h   |  1 +
>>   drivers/gpu/drm/i915/intel_bios.c | 21 +++++++++++++++++++++
>>   3 files changed, 23 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index e9f1daf258fe..7f094bbc2a7f 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1446,19 +1446,7 @@ void i915_driver_unload(struct drm_device *dev)
>>   
>>   	intel_modeset_cleanup(dev);
>>   
>> -	/*
>> -	 * free the memory space allocated for the child device
>> -	 * config parsed from VBT
>> -	 */
>> -	if (dev_priv->vbt.child_dev && dev_priv->vbt.child_dev_num) {
>> -		kfree(dev_priv->vbt.child_dev);
>> -		dev_priv->vbt.child_dev = NULL;
>> -		dev_priv->vbt.child_dev_num = 0;
>> -	}
>> -	kfree(dev_priv->vbt.sdvo_lvds_vbt_mode);
>> -	dev_priv->vbt.sdvo_lvds_vbt_mode = NULL;
>> -	kfree(dev_priv->vbt.lfp_lvds_vbt_mode);
>> -	dev_priv->vbt.lfp_lvds_vbt_mode = NULL;
>> +	intel_bios_cleanup(dev_priv);
>>   
>>   	vga_switcheroo_unregister_client(pdev);
>>   	vga_client_register(pdev, NULL, NULL, NULL);
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index d6b5ac2a563d..1cccea1b87bc 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -3675,6 +3675,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 4e74aa2f16bc..f9550507bb9f 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1610,6 +1610,27 @@ 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)
>> +{
>> +	/*
>> +	 * free the memory space allocated for the child device
>> +	 * config parsed from VBT
>> +	 */
>> +	if (dev_priv->vbt.child_dev && dev_priv->vbt.child_dev_num) {
> 
> The comment and if() seem pointless. IMO just drop them.

Ok I will send out a new version of the series with a v2 of
this patch with this fixed (for patchwork / CI) and when CI is
happy with this, push the series.

 > With that
 > Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Thanks & Regards,

Hans



> 
>> +		kfree(dev_priv->vbt.child_dev);
>> +		dev_priv->vbt.child_dev = NULL;
>> +		dev_priv->vbt.child_dev_num = 0;
>> +	}
>> +	kfree(dev_priv->vbt.sdvo_lvds_vbt_mode);
>> +	dev_priv->vbt.sdvo_lvds_vbt_mode = NULL;
>> +	kfree(dev_priv->vbt.lfp_lvds_vbt_mode);
>> +	dev_priv->vbt.lfp_lvds_vbt_mode = NULL;
>> +}
>> +
>>   /**
>>    * intel_bios_is_tv_present - is integrated TV present in VBT
>>    * @dev_priv:	i915 device instance
>> -- 
>> 2.14.3
>