releases/3.1.1/drm-i915-wrap-dp-edid-fetch-functions-to-enable-edp-panel.patch

   1 From 8c241fef3e6f69f3f675678ae03599ece3f562e2 Mon Sep 17 00:00:00 2001
   2 From: Keith Packard <keithp@keithp.com>
   3 Date: Wed, 28 Sep 2011 16:38:44 -0700
   4 Subject: drm/i915: Wrap DP EDID fetch functions to enable eDP panel power
   5
   6 From: Keith Packard <keithp@keithp.com>
   7
   8 commit 8c241fef3e6f69f3f675678ae03599ece3f562e2 upstream.
   9
  10 Talking to the eDP DDC channel requires that the panel be powered
  11 up. Wrap both the EDID and modes fetch code with calls to turn the vdd
  12 power on and back off.
  13
  14 Signed-off-by: Keith Packard <keithp@keithp.com>
  15 Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17
  18 ---
  19  drivers/gpu/drm/i915/intel_dp.c |   31 ++++++++++++++++++++++++++++---
  20  1 file changed, 28 insertions(+), 3 deletions(-)
  21
  22 --- a/drivers/gpu/drm/i915/intel_dp.c
  23 +++ b/drivers/gpu/drm/i915/intel_dp.c
  24 @@ -1683,6 +1683,31 @@ g4x_dp_detect(struct intel_dp *intel_dp)
  25         return intel_dp_detect_dpcd(intel_dp);
  26  }
  27
  28 +static struct edid *
  29 +intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
  30 +{
  31 +       struct intel_dp *intel_dp = intel_attached_dp(connector);
  32 +       struct edid     *edid;
  33 +
  34 +       ironlake_edp_panel_vdd_on(intel_dp);
  35 +       edid = drm_get_edid(connector, adapter);
  36 +       ironlake_edp_panel_vdd_off(intel_dp);
  37 +       return edid;
  38 +}
  39 +
  40 +static int
  41 +intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *adapter)
  42 +{
  43 +       struct intel_dp *intel_dp = intel_attached_dp(connector);
  44 +       int     ret;
  45 +
  46 +       ironlake_edp_panel_vdd_on(intel_dp);
  47 +       ret = intel_ddc_get_modes(connector, adapter);
  48 +       ironlake_edp_panel_vdd_off(intel_dp);
  49 +       return ret;
  50 +}
  51 +
  52 +
  53  /**
  54   * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect DP connection.
  55   *
  56 @@ -1715,7 +1740,7 @@ intel_dp_detect(struct drm_connector *co
  57         if (intel_dp->force_audio) {
  58                 intel_dp->has_audio = intel_dp->force_audio > 0;
  59         } else {
  60 -               edid = drm_get_edid(connector, &intel_dp->adapter);
  61 +               edid = intel_dp_get_edid(connector, &intel_dp->adapter);
  62                 if (edid) {
  63                         intel_dp->has_audio = drm_detect_monitor_audio(edid);
  64                         connector->display_info.raw_edid = NULL;
  65 @@ -1736,7 +1761,7 @@ static int intel_dp_get_modes(struct drm
  66         /* We should parse the EDID data and find out if it has an audio sink
  67          */
  68
  69 -       ret = intel_ddc_get_modes(connector, &intel_dp->adapter);
  70 +       ret = intel_dp_get_edid_modes(connector, &intel_dp->adapter);
  71         if (ret) {
  72                 if (is_edp(intel_dp) && !dev_priv->panel_fixed_mode) {
  73                         struct drm_display_mode *newmode;
  74 @@ -1772,7 +1797,7 @@ intel_dp_detect_audio(struct drm_connect
  75         struct edid *edid;
  76         bool has_audio = false;
  77
  78 -       edid = drm_get_edid(connector, &intel_dp->adapter);
  79 +       edid = intel_dp_get_edid(connector, &intel_dp->adapter);
  80         if (edid) {
  81                 has_audio = drm_detect_monitor_audio(edid);
  82