---

yaml --- r: 217914 b: refs/heads/master c: 6ba3ddd h: refs/heads/master v: v3
git-mirror · Sep 8, 2010 · 8f090cd · 8f090cd
1 parent cd41d1d
commit 8f090cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722506f04dae7c88193dab2fc836ff15070190f0
+refs/heads/master: 6ba3ddd9838f5e4d6ac7c6dce95648d205e11bff
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -675,10 +675,13 @@ static void update_colorkey(struct intel_overlay *overlay,
 			    struct overlay_registers *regs)
 {
 	u32 key = overlay->color_key;
+
 	switch (overlay->crtc->base.fb->bits_per_pixel) {
 	case 8:
 		regs->DCLRKV = 0;
 		regs->DCLRKM = CLK_RGB8I_MASK | DST_KEY_ENABLE;
+		break;
+
 	case 16:
 		if (overlay->crtc->base.fb->depth == 15) {
 			regs->DCLRKV = RGB15_TO_COLORKEY(key);
@@ -687,10 +690,13 @@ static void update_colorkey(struct intel_overlay *overlay,
 			regs->DCLRKV = RGB16_TO_COLORKEY(key);
 			regs->DCLRKM = CLK_RGB16_MASK | DST_KEY_ENABLE;
 		}
+		break;
+
 	case 24:
 	case 32:
 		regs->DCLRKV = key;
 		regs->DCLRKM = CLK_RGB24_MASK | DST_KEY_ENABLE;
+		break;
 	}
 }