diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
| commit | 7903aad4738b38f48fb8800782b186be8dfaa024 (patch) | |
| tree | a8b20157c57c9dc35f049725d38fb2ca645c816a /drivers/gpu/drm/drm_stub.c | |
| parent | d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee (diff) | |
| parent | 5b85050a8f1e7db530f803627ba6371ca9c0ba9b (diff) | |
Merge branch 'drm-kms' into drm-tracking
Conflicts:
drivers/mfd/glamo/glamo-cmdq.c
drivers/mfd/glamo/glamo-cmdq.h
drivers/mfd/glamo/glamo-drm-drv.c
drivers/mfd/glamo/glamo-drm-private.h
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 5f392b7be23..93ce6cc030f 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -452,10 +452,29 @@ int drm_get_platform_dev(struct platform_device *pdev, printk(KERN_ERR "DRM: Fill_in_dev failed.\n"); goto err_g1; } - dev->platform_dev = pdev; + + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL); + if (ret) + goto err_g2; + } + if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY))) - goto err_g1; + goto err_g3; + + if (dev->driver->load) { + ret = dev->driver->load(dev, 0); + if (ret) + goto err_g3; + } + + /* setup the grouping for the legacy output */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) { + ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); + if (ret) + goto err_g3; + } list_add_tail(&dev->driver_item, &driver->device_list); @@ -465,6 +484,9 @@ int drm_get_platform_dev(struct platform_device *pdev, return 0; +err_g3: + drm_put_minor(&dev->primary); +err_g2: err_g1: drm_free(dev, sizeof(*dev), DRM_MEM_STUB); return ret; |