Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/exynos: mixer: remove all static blending setup

Previously blending setup was static and most of it was
done in mixer_win_reset().

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

authored by

Tobias Jakobi and committed by
Inki Dae
5bec0193 a2cb911e

-23
-23
drivers/gpu/drm/exynos/exynos_mixer.c
··· 401 401 mixer_reg_writemask(res, MXR_LAYER_CFG, 402 402 MXR_LAYER_CFG_VP_VAL(priority), 403 403 MXR_LAYER_CFG_VP_MASK); 404 - 405 - /* control blending of graphic layer 0 */ 406 - mixer_reg_writemask(res, MXR_GRAPHIC_CFG(0), val, 407 - MXR_GRP_CFG_BLEND_PRE_MUL | 408 - MXR_GRP_CFG_PIXEL_BLEND_EN); 409 404 } 410 405 break; 411 406 } ··· 667 672 { 668 673 struct mixer_resources *res = &ctx->mixer_res; 669 674 unsigned long flags; 670 - u32 val; /* value stored to register */ 671 675 672 676 spin_lock_irqsave(&res->reg_slock, flags); 673 677 mixer_vsync_set_update(ctx, false); ··· 687 693 mixer_reg_write(res, MXR_BG_COLOR0, 0x008080); 688 694 mixer_reg_write(res, MXR_BG_COLOR1, 0x008080); 689 695 mixer_reg_write(res, MXR_BG_COLOR2, 0x008080); 690 - 691 - /* setting graphical layers */ 692 - val = MXR_GRP_CFG_COLOR_KEY_DISABLE; /* no blank key */ 693 - val |= MXR_GRP_CFG_WIN_BLEND_EN; 694 - val |= MXR_GRP_CFG_ALPHA_VAL(0xff); /* non-transparent alpha */ 695 - 696 - /* Don't blend layer 0 onto the mixer background */ 697 - mixer_reg_write(res, MXR_GRAPHIC_CFG(0), val); 698 - 699 - /* Blend layer 1 into layer 0 */ 700 - val |= MXR_GRP_CFG_BLEND_PRE_MUL; 701 - val |= MXR_GRP_CFG_PIXEL_BLEND_EN; 702 - mixer_reg_write(res, MXR_GRAPHIC_CFG(1), val); 703 - 704 - /* setting video layers */ 705 - val = MXR_GRP_CFG_ALPHA_VAL(0); 706 - mixer_reg_write(res, MXR_VIDEO_CFG, val); 707 696 708 697 if (ctx->vp_enabled) { 709 698 /* configuration of Video Processor Registers */