From a754a678cd7f564d64f40f9237598dead81180b2 Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Tue, 8 Sep 2009 14:52:25 +0800
Subject: [PATCH] --- yaml --- r: 157279 b: refs/heads/master c:
 7c8460db30dfd085ef3837c8fb02ecf2e718b983 h: refs/heads/master i:   157277:
 681457dd52b1b50471c6010ab6e253d84da68680   157275:
 578f84e2497cfe2e7ac34a01aaa31124294e3364   157271:
 54280311dec97f152ba526a5608c36e434df6643   157263:
 739d0b0c4d3d979149731065acbb9a417eb9ddeb   157247:
 b4b0103beefddaca142f51fe87ec545d6bf218a0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/i915/intel_dp.c  | 2 +-
 trunk/drivers/gpu/drm/i915/intel_drv.h | 1 +
 trunk/drivers/gpu/drm/i915/intel_tv.c  | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 57be7e8e145c..576bfa762e57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ff323f89075624b6891e7c428edb8e8a35be13c
+refs/heads/master: 7c8460db30dfd085ef3837c8fb02ecf2e718b983
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index f2afc4af4bc9..2b914d732076 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1263,7 +1263,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)
 
 	if (IS_eDP(intel_output)) {
 		intel_output->crtc_mask = (1 << 1);
-		intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
+		intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT);
 	} else
 		intel_output->crtc_mask = (1 << 0) | (1 << 1);
 	connector->interlace_allowed = true;
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
index 25aa6facc12d..26a6227c15fe 100644
--- a/trunk/drivers/gpu/drm/i915/intel_drv.h
+++ b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -74,6 +74,7 @@
 #define INTEL_LVDS_CLONE_BIT 14
 #define INTEL_DVO_TMDS_CLONE_BIT 15
 #define INTEL_DVO_LVDS_CLONE_BIT 16
+#define INTEL_EDP_CLONE_BIT 17
 
 #define INTEL_DVO_CHIP_NONE 0
 #define INTEL_DVO_CHIP_LVDS 1
diff --git a/trunk/drivers/gpu/drm/i915/intel_tv.c b/trunk/drivers/gpu/drm/i915/intel_tv.c
index 2fbe13a0de81..5b1c9e9fdba0 100644
--- a/trunk/drivers/gpu/drm/i915/intel_tv.c
+++ b/trunk/drivers/gpu/drm/i915/intel_tv.c
@@ -1730,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
 	intel_output->type = INTEL_OUTPUT_TVOUT;
+	intel_output->crtc_mask = (1 << 0) | (1 << 1);
 	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);