Skip to content

Commit

Permalink
drm/i915: Call encoder hotplug for init and resume cases
Browse files Browse the repository at this point in the history
For all the encoders, call the hot_plug if it is registered.
This is required for connected boot and resume cases to generate
fake hpd resulting in reading of edid.
Removing the initial sdvo hot_plug call too so that it will be called
just once from this loop.

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Sonika Jindal authored and Daniel Vetter committed Oct 6, 2015
1 parent 0681276 commit 5d250b0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
11 changes: 11 additions & 0 deletions drivers/gpu/drm/i915/intel_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
struct drm_mode_config *mode_config = &dev->mode_config;
struct intel_encoder *encoder;
struct drm_connector *connector;
int i;

Expand All @@ -482,6 +483,16 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
if (dev_priv->display.hpd_irq_setup)
dev_priv->display.hpd_irq_setup(dev);
spin_unlock_irq(&dev_priv->irq_lock);

/*
* Connected boot / resume scenarios can't generate new hot plug.
* So, probe it manually.
*/
list_for_each_entry(encoder, &dev->mode_config.encoder_list,
base.head) {
if (encoder->hot_plug)
encoder->hot_plug(encoder);
}
}

void intel_hpd_init_work(struct drm_i915_private *dev_priv)
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/i915/intel_sdvo.c
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,6 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
* Ensure that they get re-enabled when an interrupt happens.
*/
intel_encoder->hot_plug = intel_sdvo_enable_hotplug;
intel_sdvo_enable_hotplug(intel_encoder);
} else {
intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
}
Expand Down

0 comments on commit 5d250b0

Please sign in to comment.