Re: [Intel-gfx] [PATCH 04/14] drm/i915: Rename edp vdd funcs for consistency

2014-08-19 Thread Jani Nikula 
On Mon, 18 Aug 2014, ville.syrj...@linux.intel.com wrote:
 From: Ville Syrjälä ville.syrj...@linux.intel.com

 edp_* are now the lower level functions and intel_edp_* the higher level
 ones. One should use them in pairs.

Yeah I should've done this when I added the lower level ones. One thing
you need to fix below though.

 Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
 ---
  drivers/gpu/drm/i915/intel_dp.c | 21 +
  1 file changed, 13 insertions(+), 8 deletions(-)

 diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
 index 28d0183..30943a5 100644
 --- a/drivers/gpu/drm/i915/intel_dp.c
 +++ b/drivers/gpu/drm/i915/intel_dp.c
 @@ -111,7 +111,7 @@ static struct intel_dp *intel_attached_dp(struct 
 drm_connector *connector)
  }
  
  static void intel_dp_link_down(struct intel_dp *intel_dp);
 -static bool _edp_panel_vdd_on(struct intel_dp *intel_dp);
 +static bool edp_panel_vdd_on(struct intel_dp *intel_dp);
  static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
  
  int
 @@ -533,7 +533,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
   bool has_aux_irq = HAS_AUX_IRQ(dev);
   bool vdd;
  
 - vdd = _edp_panel_vdd_on(intel_dp);
 + vdd = edp_panel_vdd_on(intel_dp);
  
   /* dp aux is extremely sensitive to irq latency, hence request the
* lowest possible wakeup latency and so prevent the cpu from going into
 @@ -1165,7 +1165,7 @@ static  u32 ironlake_get_pp_control(struct intel_dp 
 *intel_dp)
   return control;
  }
  
 -static bool _edp_panel_vdd_on(struct intel_dp *intel_dp)
 +static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
  {
   struct drm_device *dev = intel_dp_to_dev(intel_dp);
   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
 @@ -1216,7 +1216,7 @@ static bool _edp_panel_vdd_on(struct intel_dp *intel_dp)
  void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
  {
   if (is_edp(intel_dp)) {
 - bool vdd = _edp_panel_vdd_on(intel_dp);
 + bool vdd = edp_panel_vdd_on(intel_dp);
  
   WARN(!vdd, eDP VDD already requested on\n);
   }
 @@ -1299,6 +1299,11 @@ static void edp_panel_vdd_off(struct intel_dp 
 *intel_dp, bool sync)
   edp_panel_vdd_schedule_off(intel_dp);
  }
  
 +static void intel_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
 +{
 + return edp_panel_vdd_off(intel_dp, sync);

Please don't return voids. With that fixed,

Reviewed-by: Jani Nikula jani.nik...@intel.com


 +}
 +
  void intel_edp_panel_on(struct intel_dp *intel_dp)
  {
   struct drm_device *dev = intel_dp_to_dev(intel_dp);
 @@ -2102,7 +2107,7 @@ static void intel_enable_dp(struct intel_encoder 
 *encoder)
   intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
   intel_dp_start_link_train(intel_dp);
   intel_edp_panel_on(intel_dp);
 - edp_panel_vdd_off(intel_dp, true);
 + intel_edp_panel_vdd_off(intel_dp, true);
   intel_dp_complete_link_train(intel_dp);
   intel_dp_stop_link_train(intel_dp);
  }
 @@ -3405,7 +3410,7 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
   DRM_DEBUG_KMS(Branch OUI: %02hx%02hx%02hx\n,
 buf[0], buf[1], buf[2]);
  
 - edp_panel_vdd_off(intel_dp, false);
 + intel_edp_panel_vdd_off(intel_dp, false);
  }
  
  static bool
 @@ -3429,7 +3434,7 @@ intel_dp_probe_mst(struct intel_dp *intel_dp)
   intel_dp-is_mst = false;
   }
   }
 - edp_panel_vdd_off(intel_dp, false);
 + intel_edp_panel_vdd_off(intel_dp, false);
  
   drm_dp_mst_topology_mgr_set_mst(intel_dp-mst_mgr, intel_dp-is_mst);
   return intel_dp-is_mst;
 @@ -4527,7 +4532,7 @@ static bool intel_edp_init_connector(struct intel_dp 
 *intel_dp,
   /* Cache DPCD and EDID for edp. */
   intel_edp_panel_vdd_on(intel_dp);
   has_dpcd = intel_dp_get_dpcd(intel_dp);
 - edp_panel_vdd_off(intel_dp, false);
 + intel_edp_panel_vdd_off(intel_dp, false);
  
   if (has_dpcd) {
   if (intel_dp-dpcd[DP_DPCD_REV] = 0x11)
 -- 
 1.8.5.5

 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 04/14] drm/i915: Rename edp vdd funcs for consistency

2014-08-18 Thread ville . syrjala 
From: Ville Syrjälä ville.syrj...@linux.intel.com

edp_* are now the lower level functions and intel_edp_* the higher level
ones. One should use them in pairs.

Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
---
 drivers/gpu/drm/i915/intel_dp.c | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 28d0183..30943a5 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -111,7 +111,7 @@ static struct intel_dp *intel_attached_dp(struct 
drm_connector *connector)
 }
 
 static void intel_dp_link_down(struct intel_dp *intel_dp);
-static bool _edp_panel_vdd_on(struct intel_dp *intel_dp);
+static bool edp_panel_vdd_on(struct intel_dp *intel_dp);
 static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
 
 int
@@ -533,7 +533,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
bool has_aux_irq = HAS_AUX_IRQ(dev);
bool vdd;
 
-   vdd = _edp_panel_vdd_on(intel_dp);
+   vdd = edp_panel_vdd_on(intel_dp);
 
/* dp aux is extremely sensitive to irq latency, hence request the
 * lowest possible wakeup latency and so prevent the cpu from going into
@@ -1165,7 +1165,7 @@ static  u32 ironlake_get_pp_control(struct intel_dp 
*intel_dp)
return control;
 }
 
-static bool _edp_panel_vdd_on(struct intel_dp *intel_dp)
+static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
 {
struct drm_device *dev = intel_dp_to_dev(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
@@ -1216,7 +1216,7 @@ static bool _edp_panel_vdd_on(struct intel_dp *intel_dp)
 void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
 {
if (is_edp(intel_dp)) {
-   bool vdd = _edp_panel_vdd_on(intel_dp);
+   bool vdd = edp_panel_vdd_on(intel_dp);
 
WARN(!vdd, eDP VDD already requested on\n);
}
@@ -1299,6 +1299,11 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, 
bool sync)
edp_panel_vdd_schedule_off(intel_dp);
 }
 
+static void intel_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
+{
+   return edp_panel_vdd_off(intel_dp, sync);
+}
+
 void intel_edp_panel_on(struct intel_dp *intel_dp)
 {
struct drm_device *dev = intel_dp_to_dev(intel_dp);
@@ -2102,7 +2107,7 @@ static void intel_enable_dp(struct intel_encoder *encoder)
intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
intel_dp_start_link_train(intel_dp);
intel_edp_panel_on(intel_dp);
-   edp_panel_vdd_off(intel_dp, true);
+   intel_edp_panel_vdd_off(intel_dp, true);
intel_dp_complete_link_train(intel_dp);
intel_dp_stop_link_train(intel_dp);
 }
@@ -3405,7 +3410,7 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
DRM_DEBUG_KMS(Branch OUI: %02hx%02hx%02hx\n,
  buf[0], buf[1], buf[2]);
 
-   edp_panel_vdd_off(intel_dp, false);
+   intel_edp_panel_vdd_off(intel_dp, false);
 }
 
 static bool
@@ -3429,7 +3434,7 @@ intel_dp_probe_mst(struct intel_dp *intel_dp)
intel_dp-is_mst = false;
}
}
-   edp_panel_vdd_off(intel_dp, false);
+   intel_edp_panel_vdd_off(intel_dp, false);
 
drm_dp_mst_topology_mgr_set_mst(intel_dp-mst_mgr, intel_dp-is_mst);
return intel_dp-is_mst;
@@ -4527,7 +4532,7 @@ static bool intel_edp_init_connector(struct intel_dp 
*intel_dp,
/* Cache DPCD and EDID for edp. */
intel_edp_panel_vdd_on(intel_dp);
has_dpcd = intel_dp_get_dpcd(intel_dp);
-   edp_panel_vdd_off(intel_dp, false);
+   intel_edp_panel_vdd_off(intel_dp, false);
 
if (has_dpcd) {
if (intel_dp-dpcd[DP_DPCD_REV] = 0x11)
-- 
1.8.5.5

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx