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/gpu/drm/msm | |
| parent | 4b7ba8697bc519abd4f79057f65a8a8e7107ac37 (diff) | |
| parent | 2a8c6edfd2a888085ae0ddaf6c3ea3f529fdc4e8 (diff) | |
| download | linux-afa95e7403298110943bc2dc0ab25f8b42b6334c.tar.gz linux-afa95e7403298110943bc2dc0ab25f8b42b6334c.tar.bz2 linux-afa95e7403298110943bc2dc0ab25f8b42b6334c.zip | |
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/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c index 28f7e3ec6c28..76960faae38f 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c @@ -306,7 +306,7 @@ static void hdmi_connector_destroy(struct drm_connector *connector) hdp_disable(hdmi_connector); - drm_sysfs_connector_remove(connector); + drm_connector_unregister(connector); drm_connector_cleanup(connector); hdmi_unreference(hdmi_connector->hdmi); @@ -416,7 +416,7 @@ struct drm_connector *hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed = 1; connector->doublescan_allowed = 0; - drm_sysfs_connector_add(connector); + drm_connector_register(connector); ret = hpd_enable(hdmi_connector); if (ret) { |