From 0d661eeeea11b32567f5d071e938267b070d1d52 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 13 Sep 2010 16:53:12 +0100 Subject: [PATCH] --- yaml --- r: 218015 b: refs/heads/master c: e2e767abd85806d05a5266b3b112baaf80ee3382 h: refs/heads/master i: 218013: 5dfa300eab5fdc5c1133256ef332e4dd5e97425b 218011: 2f49029530c50c565847d306410bd28675e48b84 218007: 27509dc2a13822550412e1ce3bd2441c28948f4e 217999: f36d5437138bb39ac68a7aac5fc0c98ed8c6ae43 217983: 3f95e0116629cbed43dc5754a3ca16825e29f3f0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ca32f8e57115..5df48ed4580a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e65d9305f528d4f354378690135ee8d1c60ec0a5 +refs/heads/master: e2e767abd85806d05a5266b3b112baaf80ee3382 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index e4fd7a3a9ee6..16ae34559caa 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -5178,8 +5178,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) drm_crtc_init(dev, &intel_crtc->base, &intel_crtc_funcs); drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256); - intel_crtc->pipe = pipe; - intel_crtc->plane = pipe; for (i = 0; i < 256; i++) { intel_crtc->lut_r[i] = i; intel_crtc->lut_g[i] = i; @@ -5189,9 +5187,9 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) /* Swap pipes & planes for FBC on pre-965 */ intel_crtc->pipe = pipe; intel_crtc->plane = pipe; - if (IS_MOBILE(dev) && (IS_I9XX(dev) && !IS_I965G(dev))) { + if (IS_MOBILE(dev) && IS_GEN3(dev)) { DRM_DEBUG_KMS("swapping pipes & planes for FBC\n"); - intel_crtc->plane = ((pipe == 0) ? 1 : 0); + intel_crtc->plane = !pipe; } BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||