Merge tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[karo-tx-linux.git] / drivers / gpu / drm / exynos / exynos_mixer.c

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 9d0c21a50a868e1f11062e89b1f3f1c5734e9604..e8b4ec84b312cc412351b08ab6e09f0626d5cc05 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -365,6 +365,11 @@ static void mixer_cfg_layer(struct mixer_context *ctx, int win, bool enable)
                        vp_reg_writemask(res, VP_ENABLE, val, VP_ENABLE_ON);
                        mixer_reg_writemask(res, MXR_CFG, val,
                                MXR_CFG_VP_ENABLE);
+
+                       /* control blending of graphic layer 0 */
+                       mixer_reg_writemask(res, MXR_GRAPHIC_CFG(0), val,
+                                       MXR_GRP_CFG_BLEND_PRE_MUL |
+                                       MXR_GRP_CFG_PIXEL_BLEND_EN);
                }
                break;
        }
@@ -1240,6 +1245,7 @@ static struct of_device_id mixer_match_types[] = {
                /* end node */
        }
 };
+MODULE_DEVICE_TABLE(of, mixer_match_types);
 
 static int mixer_bind(struct device *dev, struct device *manager, void *data)
 {