Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9514ac6e7a55328b1fad4b7fc7227d3beb01d7ad

Authored by Chon Ming Lee
Committed by Daniel Vetter
1 parent e8dfcf7895
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drm/i915: Move some hdmi enable function name to vlv specific. 

There is no functional change on this patch.  Only rename several
hdmi encoder function name which suppose to use only by valleyview from
intel_hdmi_pre_pll_enable to vlv_hdmi_pre_pll_enable, and etc.

Signed-off-by: Chon Ming Lee <chon.ming.lee@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

drivers/gpu/drm/i915/intel_hdmi.c
Diff comments   View file @ 9514ac6
... ... @@ -1074,7 +1074,7 @@
1074 1074 return 0;
1075 1075 }
1076 1076  
1077   -static void intel_hdmi_pre_enable(struct intel_encoder *encoder)
  1077 +static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
1078 1078 {
1079 1079 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
1080 1080 struct drm_device *dev = encoder->base.dev;
... ... @@ -1127,7 +1127,7 @@
1127 1127 vlv_wait_port_ready(dev_priv, port);
1128 1128 }
1129 1129  
1130   -static void intel_hdmi_pre_pll_enable(struct intel_encoder *encoder)
  1130 +static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)
1131 1131 {
1132 1132 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
1133 1133 struct drm_device *dev = encoder->base.dev;
... ... @@ -1163,7 +1163,7 @@
1163 1163 mutex_unlock(&dev_priv->dpio_lock);
1164 1164 }
1165 1165  
1166   -static void intel_hdmi_post_disable(struct intel_encoder *encoder)
  1166 +static void vlv_hdmi_post_disable(struct intel_encoder *encoder)
1167 1167 {
1168 1168 struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
1169 1169 struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
1170 1170  
... ... @@ -1313,10 +1313,10 @@
1313 1313 intel_encoder->get_hw_state = intel_hdmi_get_hw_state;
1314 1314 intel_encoder->get_config = intel_hdmi_get_config;
1315 1315 if (IS_VALLEYVIEW(dev)) {
1316   - intel_encoder->pre_pll_enable = intel_hdmi_pre_pll_enable;
1317   - intel_encoder->pre_enable = intel_hdmi_pre_enable;
  1316 + intel_encoder->pre_pll_enable = vlv_hdmi_pre_pll_enable;
  1317 + intel_encoder->pre_enable = vlv_hdmi_pre_enable;
1318 1318 intel_encoder->enable = vlv_enable_hdmi;
1319   - intel_encoder->post_disable = intel_hdmi_post_disable;
  1319 + intel_encoder->post_disable = vlv_hdmi_post_disable;
1320 1320 } else {
1321 1321 intel_encoder->enable = intel_enable_hdmi;
1322 1322 }