diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 20:49:36 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 20:49:36 +0200 |
| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch) | |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b /drivers/gpu/drm/msm/hdmi/hdmi_connector.c | |
| parent | 487777673e355ab9f0b7cac4ad1207be9d36156f (diff) | |
| parent | e05444be705b5c7c7f85d7722b6f97f3a6732d54 (diff) | |
| download | lwn-4dac3edfe68e5e1b3c2216b84ba160572420fa40.tar.gz lwn-4dac3edfe68e5e1b3c2216b84ba160572420fa40.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Pull in drm-next with Dave's DP MST support so that I can merge some
conflicting patches which also touch the driver load sequencing around
interrupt handling.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/msm/hdmi/hdmi_connector.c')
| -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) { |