From 7e5d24fdcfea6cb2941362d9eccf6e19e1fd3329 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Thu, 25 Apr 2013 15:13:26 -0400 Subject: [PATCH] --- yaml --- r: 371623 b: refs/heads/master c: 0377f4ed9f1aed30292c4e3c87f24e028ae26f36 h: refs/heads/master i: 371621: aa00d17e4ddff099d65e89181a83a067ca23a718 371619: 368543c0a51336e2698d3cc0ee6fcc4e75b961d6 371615: 87644be3bfc79a4918f69eb79e44541d2d043de2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1f4257da5c38..2089ab5a5474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f46c333f9522938ed3c54fe9d7ee2b61e41ad2f +refs/heads/master: 0377f4ed9f1aed30292c4e3c87f24e028ae26f36 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c index f08e2512c931..ec3e376b7e01 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c @@ -643,12 +643,14 @@ static void mixer_win_reset(struct mixer_context *ctx) /* setting graphical layers */ val = MXR_GRP_CFG_COLOR_KEY_DISABLE; /* no blank key */ val |= MXR_GRP_CFG_WIN_BLEND_EN; - val |= MXR_GRP_CFG_BLEND_PRE_MUL; - val |= MXR_GRP_CFG_PIXEL_BLEND_EN; val |= MXR_GRP_CFG_ALPHA_VAL(0xff); /* non-transparent alpha */ - /* the same configuration for both layers */ + /* Don't blend layer 0 onto the mixer background */ mixer_reg_write(res, MXR_GRAPHIC_CFG(0), val); + + /* Blend layer 1 into layer 0 */ + val |= MXR_GRP_CFG_BLEND_PRE_MUL; + val |= MXR_GRP_CFG_PIXEL_BLEND_EN; mixer_reg_write(res, MXR_GRAPHIC_CFG(1), val); /* setting video layers */