On Tue, May 05, 2020 at 11:56:46AM +0200, Thomas Zimmermann wrote:
Done to simplify initialization code before embedding the DRM device instance in struct mga_device.
Signed-off-by: Thomas Zimmermann tzimmermann@suse.de
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/mgag200/mgag200_main.c | 67 ++++++++++---------------- 1 file changed, 26 insertions(+), 41 deletions(-)
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index b705b7776d2fc..3830d3f3c9fa2 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c @@ -89,12 +89,23 @@ static int mga_vram_init(struct mga_device *mdev) return 0; }
-static int mgag200_device_init(struct drm_device *dev,
uint32_t flags)+/*
- Functions here will be called by the core once it's bound the driver to
- a PCI device
- */
+int mgag200_driver_load(struct drm_device *dev, unsigned long flags) {
- struct mga_device *mdev = to_mga_device(dev);
struct mga_device *mdev; 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);
@@ -110,7 +121,7 @@ static int mgag200_device_init(struct drm_device *dev,
if (!devm_request_mem_region(mdev->dev->dev, mdev->rmmio_base, mdev->rmmio_size, "mgadrmfb_mmio")) {
DRM_ERROR("can't reserve mmio registers\n");
drm_err(dev, "can't reserve mmio registers\n");@@ -121,8 +132,8 @@ static int mgag200_device_init(struct drm_device *dev, /* stash G200 SE model number for later use */ if (IS_G200_SE(mdev)) { mdev->unique_rev_id = RREG32(0x1e24);
DRM_DEBUG("G200 SE unique revision id is 0x%x\n",mdev->unique_rev_id);
drm_dbg(dev, "G200 SE unique revision id is 0x%x\n",mdev->unique_rev_id);}
ret = mga_vram_init(mdev);
@@ -133,33 +144,9 @@ static int mgag200_device_init(struct drm_device *dev, mdev->bpp_shifts[1] = 1; mdev->bpp_shifts[2] = 0; mdev->bpp_shifts[3] = 2;
- return 0;
-}
-/*
- Functions here will be called by the core once it's bound the driver to
- a PCI device
- */
-int mgag200_driver_load(struct drm_device *dev, unsigned long flags) -{
- struct mga_device *mdev;
- int r;
- mdev = devm_kzalloc(dev->dev, sizeof(struct mga_device), GFP_KERNEL);
- if (mdev == NULL)
return -ENOMEM;- dev->dev_private = (void *)mdev;
- mdev->dev = dev;
- r = mgag200_device_init(dev, flags);
- if (r) {
dev_err(&dev->pdev->dev, "Fatal error during GPU init: %d\n", r);return r;- }
- r = mgag200_mm_init(mdev);
- if (r)
ret = mgag200_mm_init(mdev);
if (ret) goto err_mm;
drm_mode_config_init(dev);
@@ -170,16 +157,15 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags) dev->mode_config.preferred_depth = 32; dev->mode_config.prefer_shadow = 1;
- r = mgag200_modeset_init(mdev);
- if (r) {
dev_err(&dev->pdev->dev, "Fatal error during modeset init: %d\n", r);
- ret = mgag200_modeset_init(mdev);
- if (ret) {
drm_err(dev, "Fatal error during modeset init: %d\n", ret);
- r = mgag200_cursor_init(mdev);
- if (r)
dev_warn(&dev->pdev->dev,"Could not initialize cursors. Not doing hardware cursors.\n");
ret = mgag200_cursor_init(mdev);
if (ret)
drm_err(dev, "Could not initialize cursors. Not doing hardware cursors.\n");return 0;
@@ -189,8 +175,7 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags) mgag200_mm_fini(mdev); err_mm: dev->dev_private = NULL;
- return r;
- return ret;
}
void mgag200_driver_unload(struct drm_device *dev)
2.26.0