aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-13 11:53:12 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-13 12:04:15 -0400
commite2e767abd85806d05a5266b3b112baaf80ee3382 (patch)
tree343d6b70a879116419423b274777f68f86f74161 /drivers/gpu/drm/i915/intel_display.c
parente65d9305f528d4f354378690135ee8d1c60ec0a5 (diff)
drm/i915: Remove redundant initialisation of crtc->pipe
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e4fd7a3a9ee6..16ae34559caa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5178,8 +5178,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
5178 drm_crtc_init(dev, &intel_crtc->base, &intel_crtc_funcs); 5178 drm_crtc_init(dev, &intel_crtc->base, &intel_crtc_funcs);
5179 5179
5180 drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256); 5180 drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
5181 intel_crtc->pipe = pipe;
5182 intel_crtc->plane = pipe;
5183 for (i = 0; i < 256; i++) { 5181 for (i = 0; i < 256; i++) {
5184 intel_crtc->lut_r[i] = i; 5182 intel_crtc->lut_r[i] = i;
5185 intel_crtc->lut_g[i] = i; 5183 intel_crtc->lut_g[i] = i;
@@ -5189,9 +5187,9 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
5189 /* Swap pipes & planes for FBC on pre-965 */ 5187 /* Swap pipes & planes for FBC on pre-965 */
5190 intel_crtc->pipe = pipe; 5188 intel_crtc->pipe = pipe;
5191 intel_crtc->plane = pipe; 5189 intel_crtc->plane = pipe;
5192 if (IS_MOBILE(dev) && (IS_I9XX(dev) && !IS_I965G(dev))) { 5190 if (IS_MOBILE(dev) && IS_GEN3(dev)) {
5193 DRM_DEBUG_KMS("swapping pipes & planes for FBC\n"); 5191 DRM_DEBUG_KMS("swapping pipes & planes for FBC\n");
5194 intel_crtc->plane = ((pipe == 0) ? 1 : 0); 5192 intel_crtc->plane = !pipe;
5195 } 5193 }
5196 5194
5197 BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) || 5195 BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||