[PATCH] drm/vmwgfx: Call vmw_driver_{load,unload}() before registering device

[Thomas Hellstrom]

On 12/9/19 12:06 PM, Thomas Zimmermann wrote:
> The load/unload callbacks in struct drm_driver are deprecated. Remove
> them and call functions explicitly.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 44 +++++++++++++++++++++++++----
>  1 file changed, 38 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index e962048f65d2..f34f1eb57cfa 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -28,10 +28,10 @@
>  #include <linux/console.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/module.h>
> +#include <linux/pci.h>
>
>  #include <drm/drm_drv.h>
>  #include <drm/drm_ioctl.h>
> -#include <drm/drm_pci.h>
>  #include <drm/drm_sysfs.h>
>  #include <drm/ttm/ttm_bo_driver.h>
>  #include <drm/ttm/ttm_module.h>
> @@ -1211,8 +1211,10 @@ static void vmw_remove(struct pci_dev *pdev)
>  {
>  	struct drm_device *dev = pci_get_drvdata(pdev);
>
> +	drm_dev_unregister(dev);
> +	vmw_driver_unload(dev);
> +	drm_dev_put(dev);
>  	pci_disable_device(pdev);
> -	drm_put_dev(dev);
>  }
>
>  static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
> @@ -1329,7 +1331,7 @@ static int vmw_pm_freeze(struct device *kdev)
>
>  	vmw_fence_fifo_down(dev_priv->fman);
>  	__vmw_svga_disable(dev_priv);
> -
> +

Unrelated whitespace-fixup.

Otherwise looks good, but still conflicts in the above hunk when I try
to apply it. Could be some TAB-mangling on the way perhaps.

Could you remove that hunk and resend?

Thanks,

Thomas