diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-12-09 14:58:34 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-12-09 14:58:34 +0100 |
commit | 01dd1fa26b85167cd19b04b10e015aba3e243d08 (patch) | |
tree | 3c6f9d8531e9ff60f56c7d978c1f8493599d3c88 /drivers/gpu/drm/i915/display/intel_dp.c | |
parent | drm/i915/trace: split out display trace to a separate file (diff) | |
parent | Merge tag 'drm-misc-next-2021-11-29' of git://anongit.freedesktop.org/drm/drm... (diff) | |
download | linux-01dd1fa26b85167cd19b04b10e015aba3e243d08.tar.xz linux-01dd1fa26b85167cd19b04b10e015aba3e243d08.zip |
Merge drm/drm-next into drm-intel-next
Get the dependencies for merging drm-privacy-screen support.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 737f2f880de3..b5e2508db1cf 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5060,7 +5060,7 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work) DRM_MODE_LINK_STATUS_BAD); mutex_unlock(&connector->dev->mode_config.mutex); /* Send Hotplug uevent so userspace can reprobe */ - drm_kms_helper_hotplug_event(connector->dev); + drm_kms_helper_connector_hotplug_event(connector); } bool |