From 90f50638d6de205683cd977f53c58ffabfe90c29 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 16 Jul 2010 14:46:27 -0400 Subject: [PATCH] --- yaml --- r: 205156 b: refs/heads/master c: f091737978251811e34e7813ba4bfae5cae0b810 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4a8b1ff201be..ef7a1d24d121 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49be663f9952d0fc50bb0a4a75c3fd201e40ec59 +refs/heads/master: f091737978251811e34e7813ba4bfae5cae0b810 diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index 5a11a2bada37..a06d186a14a5 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -43,7 +43,7 @@ #define DP_LINK_CONFIGURATION_SIZE 9 #define IS_eDP(i) ((i)->type == INTEL_OUTPUT_EDP) -#define IS_PCH_eDP(dp_priv) ((dp_priv)->has_edp) +#define IS_PCH_eDP(dp_priv) ((dp_priv)->is_pch_edp) struct intel_dp_priv { uint32_t output_reg; @@ -57,7 +57,7 @@ struct intel_dp_priv { struct intel_encoder *intel_encoder; struct i2c_adapter adapter; struct i2c_algo_dp_aux_data algo; - bool has_edp; + bool is_pch_edp; }; static void @@ -598,7 +598,7 @@ bool intel_pch_has_edp(struct drm_crtc *crtc) dp_priv = intel_encoder->dev_priv; if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) - return dp_priv->has_edp; + return dp_priv->is_pch_edp; } return false; } @@ -1530,7 +1530,7 @@ intel_dp_init(struct drm_device *dev, int output_reg) if (HAS_PCH_SPLIT(dev) && (output_reg == PCH_DP_D)) { if (intel_dpd_is_edp(dev)) - dp_priv->has_edp = true; + dp_priv->is_pch_edp = true; } intel_encoder->crtc_mask = (1 << 0) | (1 << 1);