diff options
author | Adam Jackson <ajax@redhat.com> | 2010-07-16 14:46:27 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-08-01 22:37:46 -0400 |
commit | f091737978251811e34e7813ba4bfae5cae0b810 (patch) | |
tree | 5b950a337c6cc59136ffc1babedd559007b50c39 | |
parent | 49be663f9952d0fc50bb0a4a75c3fd201e40ec59 (diff) |
drm/i915/dp: Rename has_edp to is_pch_edp to reflect its real meaning
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 5a11a2bada3..a06d186a14a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #define DP_LINK_CONFIGURATION_SIZE 9 | 43 | #define DP_LINK_CONFIGURATION_SIZE 9 |
44 | 44 | ||
45 | #define IS_eDP(i) ((i)->type == INTEL_OUTPUT_EDP) | 45 | #define IS_eDP(i) ((i)->type == INTEL_OUTPUT_EDP) |
46 | #define IS_PCH_eDP(dp_priv) ((dp_priv)->has_edp) | 46 | #define IS_PCH_eDP(dp_priv) ((dp_priv)->is_pch_edp) |
47 | 47 | ||
48 | struct intel_dp_priv { | 48 | struct intel_dp_priv { |
49 | uint32_t output_reg; | 49 | uint32_t output_reg; |
@@ -57,7 +57,7 @@ struct intel_dp_priv { | |||
57 | struct intel_encoder *intel_encoder; | 57 | struct intel_encoder *intel_encoder; |
58 | struct i2c_adapter adapter; | 58 | struct i2c_adapter adapter; |
59 | struct i2c_algo_dp_aux_data algo; | 59 | struct i2c_algo_dp_aux_data algo; |
60 | bool has_edp; | 60 | bool is_pch_edp; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | static void | 63 | static void |
@@ -598,7 +598,7 @@ bool intel_pch_has_edp(struct drm_crtc *crtc) | |||
598 | dp_priv = intel_encoder->dev_priv; | 598 | dp_priv = intel_encoder->dev_priv; |
599 | 599 | ||
600 | if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) | 600 | if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) |
601 | return dp_priv->has_edp; | 601 | return dp_priv->is_pch_edp; |
602 | } | 602 | } |
603 | return false; | 603 | return false; |
604 | } | 604 | } |
@@ -1530,7 +1530,7 @@ intel_dp_init(struct drm_device *dev, int output_reg) | |||
1530 | 1530 | ||
1531 | if (HAS_PCH_SPLIT(dev) && (output_reg == PCH_DP_D)) { | 1531 | if (HAS_PCH_SPLIT(dev) && (output_reg == PCH_DP_D)) { |
1532 | if (intel_dpd_is_edp(dev)) | 1532 | if (intel_dpd_is_edp(dev)) |
1533 | dp_priv->has_edp = true; | 1533 | dp_priv->is_pch_edp = true; |
1534 | } | 1534 | } |
1535 | 1535 | ||
1536 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); | 1536 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); |