Commit c714dd94 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Separate device initialization into allocation 



Embedding the DRM device instance in struct mga_device will require
changes to device allocation. Moving the device initialization into
its own functions gets it out of the way.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605135803.19811-12-tzimmermann@suse.de
parent ba5b90e8

drivers/gpu/drm/mgag200/mgag200_drv.c

+22 −10
Original line number Diff line number Diff line
@@ -43,17 +43,11 @@ static struct drm_driver mgag200_driver = { 
 * DRM device

 */



static int mgag200_driver_load(struct drm_device *dev, unsigned long flags)

static int mgag200_device_init(struct mga_device *mdev, unsigned long flags)

{

	struct mga_device *mdev;

	struct drm_device *dev = mdev->dev;

	int ret, option;



	mdev = devm_kzalloc(dev->dev, sizeof(struct mga_device), GFP_KERNEL);

	if (mdev == NULL)

		return -ENOMEM;

	dev->dev_private = (void *)mdev;

	mdev->dev = dev;



	mdev->flags = mgag200_flags_from_driver_data(flags);

	mdev->type = mgag200_type_from_driver_data(flags);
@@ -83,14 +77,32 @@ static int mgag200_driver_load(struct drm_device *dev, unsigned long flags) 


	ret = mgag200_mm_init(mdev);

	if (ret)

		goto err_mm;

		return ret;



	ret = mgag200_modeset_init(mdev);

	if (ret) {

		drm_err(dev, "Fatal error during modeset init: %d\n", ret);

		goto err_mm;

		return ret;

	}



	return 0;

}



static int mgag200_driver_load(struct drm_device *dev, unsigned long flags)

{

	struct mga_device *mdev;

	int ret;



	mdev = devm_kzalloc(dev->dev, sizeof(struct mga_device), GFP_KERNEL);

	if (mdev == NULL)

		return -ENOMEM;

	dev->dev_private = (void *)mdev;

	mdev->dev = dev;



	ret = mgag200_device_init(mdev, flags);

	if (ret)

		goto err_mm;



	return 0;



err_mm: