Commit 1daddbc8 authored by Fabio Rafael da Rosa's avatar Fabio Rafael da Rosa Committed by Greg Kroah-Hartman
Browse files

staging: vboxvideo: Update driver to use drm_dev_register. 



The use of load and unload hooks is deprecated. DRM drivers should
use drm_dev_alloc|drm_dev_init and drm_dev_register for initialization
and publishing.

Signed-off-by: default avatarFabio Rafael da Rosa <fdr@pid42.net>
Reviewed-by: default avatarNicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 089a137a

drivers/staging/vboxvideo/TODO

+0 −1
Original line number Diff line number Diff line 
TODO:

-Move the driver over to the atomic API

-Stop using old load / unload drm_driver hooks

-Get a full review from the drm-maintainers on dri-devel done on this driver

-Extend this TODO with the results of that review

drivers/staging/vboxvideo/vbox_drv.c

+30 −4
Original line number Diff line number Diff line
@@ -51,14 +51,42 @@ MODULE_DEVICE_TABLE(pci, pciidlist); 


static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	return drm_get_pci_dev(pdev, ent, &driver);

	struct drm_device *dev = NULL;

	int ret = 0;



	dev = drm_dev_alloc(&driver, &pdev->dev);

	if (IS_ERR(dev)) {

		ret = PTR_ERR(dev);

		goto err_drv_alloc;

	}

	dev->pdev = pdev;

	pci_set_drvdata(pdev, dev);



	ret = vbox_driver_load(dev);

	if (ret)

		goto err_vbox_driver_load;



	ret = drm_dev_register(dev, 0);

	if (ret)

		goto err_drv_dev_register;



	return ret;



 err_drv_dev_register:

	vbox_driver_unload(dev);

 err_vbox_driver_load:

	drm_dev_put(dev);

 err_drv_alloc:

	return ret;

}



static void vbox_pci_remove(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);



	drm_put_dev(dev);

	drm_dev_unregister(dev);

	vbox_driver_unload(dev);

	drm_dev_put(dev);

}



static int vbox_drm_freeze(struct drm_device *dev)
@@ -227,8 +255,6 @@ static struct drm_driver driver = { 
	    DRIVER_PRIME,

	.dev_priv_size = 0,



	.load = vbox_driver_load,

	.unload = vbox_driver_unload,

	.lastclose = vbox_driver_lastclose,

	.master_set = vbox_master_set,

	.master_drop = vbox_master_drop,

drivers/staging/vboxvideo/vbox_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct vbox_private { 
#undef CURSOR_PIXEL_COUNT

#undef CURSOR_DATA_SIZE



int vbox_driver_load(struct drm_device *dev, unsigned long flags);

int vbox_driver_load(struct drm_device *dev);

void vbox_driver_unload(struct drm_device *dev);

void vbox_driver_lastclose(struct drm_device *dev);

drivers/staging/vboxvideo/vbox_main.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void vbox_hw_fini(struct vbox_private *vbox) 
	pci_iounmap(vbox->dev->pdev, vbox->guest_heap);

}



int vbox_driver_load(struct drm_device *dev, unsigned long flags)

int vbox_driver_load(struct drm_device *dev)

{

	struct vbox_private *vbox;

	int ret = 0;