diff options
author | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:04:35 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:04:35 +1000 |
commit | afa95e7403298110943bc2dc0ab25f8b42b6334c (patch) | |
tree | b6ecacf111378b498099d025702dd81f3174a2ab /drivers/staging | |
parent | 4b7ba8697bc519abd4f79057f65a8a8e7107ac37 (diff) | |
parent | 2a8c6edfd2a888085ae0ddaf6c3ea3f529fdc4e8 (diff) | |
download | op-kernel-dev-afa95e7403298110943bc2dc0ab25f8b42b6334c.zip op-kernel-dev-afa95e7403298110943bc2dc0ab25f8b42b6334c.tar.gz |
Merge tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel into drm-next
misc core patches picked up by Daniel and Jani.
* tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel:
drm/fb-helper: Remove unnecessary list empty check in drm_fb_helper_debug_enter()
drm/fb-helper: Redundant info->fix.type_aux setting in drm_fb_helper_fill_fix()
drm/debugfs: add an "edid_override" file per connector
drm/debugfs: add a "force" file per connector
drm: add register and unregister functions for connectors
drm: fix uninitialized acquire_ctx fields (v2)
drm: Driver-specific ioctls range from 0x40 to 0x9f
drm: Don't export internal module variables
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index def8280..6f54ff4 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -202,7 +202,7 @@ static const struct file_operations imx_drm_driver_fops = { void imx_drm_connector_destroy(struct drm_connector *connector) { - drm_sysfs_connector_remove(connector); + drm_connector_unregister(connector); drm_connector_cleanup(connector); } EXPORT_SYMBOL_GPL(imx_drm_connector_destroy); @@ -293,10 +293,10 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) * userspace will expect to be able to access DRM at this point. */ list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - ret = drm_sysfs_connector_add(connector); + ret = drm_connector_register(connector); if (ret) { dev_err(drm->dev, - "[CONNECTOR:%d:%s] drm_sysfs_connector_add failed: %d\n", + "[CONNECTOR:%d:%s] drm_connector_register failed: %d\n", connector->base.id, connector->name, ret); goto err_unbind; |