[PATCH] drm: Make drm_pci_agp_init legacy

[Thomas Zimmermann]

Hi

Am 07.03.20 um 10:37 schrieb Chris Wilson:
> Pull the drm_pci_agp_init() underneath the legacy ifdeffry alongside its
> only caller.

My I suggest to change the commit message slightly, because the patch
actually moves drm_pci_agp_destroy(). Something along 'implement
_destroy() before _init() to protect the latter by CONFIG_DRM_LEGACY'
should do.

> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

In any case

Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>  drivers/gpu/drm/drm_pci.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 5218475ad7e7..81aa21561982 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -166,6 +166,18 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
>  	return drm_pci_irq_by_busid(dev, p);
>  }
>  
> +void drm_pci_agp_destroy(struct drm_device *dev)
> +{
> +	if (dev->agp) {
> +		arch_phys_wc_del(dev->agp->agp_mtrr);
> +		drm_legacy_agp_clear(dev);
> +		kfree(dev->agp);
> +		dev->agp = NULL;
> +	}
> +}
> +
> +#ifdef CONFIG_DRM_LEGACY
> +
>  static void drm_pci_agp_init(struct drm_device *dev)
>  {
>  	if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
> @@ -180,18 +192,6 @@ static void drm_pci_agp_init(struct drm_device *dev)
>  	}
>  }
>  
> -void drm_pci_agp_destroy(struct drm_device *dev)
> -{
> -	if (dev->agp) {
> -		arch_phys_wc_del(dev->agp->agp_mtrr);
> -		drm_legacy_agp_clear(dev);
> -		kfree(dev->agp);
> -		dev->agp = NULL;
> -	}
> -}
> -
> -#ifdef CONFIG_DRM_LEGACY
> -
>  static int drm_get_pci_dev(struct pci_dev *pdev,
>  			   const struct pci_device_id *ent,
>  			   struct drm_driver *driver)
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20200309/dfea12fb/attachment-0001.sig>