diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 22:49:36 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 22:49:36 +0400 |
| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch) | |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b /drivers/gpu/drm/i915/intel_dsi.c | |
| parent | 487777673e355ab9f0b7cac4ad1207be9d36156f (diff) | |
| parent | e05444be705b5c7c7f85d7722b6f97f3a6732d54 (diff) | |
| download | linux-4dac3edfe68e5e1b3c2216b84ba160572420fa40.tar.xz | |
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/i915/intel_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index a9a7fb4b7179..2ee1722c0af4 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -742,7 +742,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector_attach_encoder(intel_connector, intel_encoder); - drm_sysfs_connector_add(connector); + drm_connector_register(connector); fixed_mode = dsi->dev_ops->get_modes(&intel_dsi->dev); if (!fixed_mode) { |