diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2012-02-14 21:25:17 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-02-16 04:40:43 -0500 |
commit | 44a0e022b86a8c12ed06c02f52045c8f9f118bb1 (patch) | |
tree | aa4bf658dbc8c7877bd1c826327910b051128812 /drivers/gpu | |
parent | 1109bf8bcbf455e4cfebce862f9f9fa5a2f386e9 (diff) |
drm/exynos: changed priority of mixer layers.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 33afd0cf036a..47961679c447 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
@@ -779,15 +779,15 @@ static void mixer_win_reset(struct mixer_context *ctx) | |||
779 | mixer_reg_writemask(res, MXR_STATUS, MXR_STATUS_16_BURST, | 779 | mixer_reg_writemask(res, MXR_STATUS, MXR_STATUS_16_BURST, |
780 | MXR_STATUS_BURST_MASK); | 780 | MXR_STATUS_BURST_MASK); |
781 | 781 | ||
782 | /* setting default layer priority: layer1 > video > layer0 | 782 | /* setting default layer priority: layer1 > layer0 > video |
783 | * because typical usage scenario would be | 783 | * because typical usage scenario would be |
784 | * layer1 - OSD | ||
784 | * layer0 - framebuffer | 785 | * layer0 - framebuffer |
785 | * video - video overlay | 786 | * video - video overlay |
786 | * layer1 - OSD | ||
787 | */ | 787 | */ |
788 | val = MXR_LAYER_CFG_GRP0_VAL(1); | 788 | val = MXR_LAYER_CFG_GRP1_VAL(3); |
789 | val |= MXR_LAYER_CFG_VP_VAL(2); | 789 | val |= MXR_LAYER_CFG_GRP0_VAL(2); |
790 | val |= MXR_LAYER_CFG_GRP1_VAL(3); | 790 | val |= MXR_LAYER_CFG_VP_VAL(1); |
791 | mixer_reg_write(res, MXR_LAYER_CFG, val); | 791 | mixer_reg_write(res, MXR_LAYER_CFG, val); |
792 | 792 | ||
793 | /* setting background color */ | 793 | /* setting background color */ |