diff options
| author |   Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-07-28 10:30:18 +0200 |
|---|---|---|
| committer | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-07-30 19:26:59 +0200 |
| commit | e21e21939ce0031c11605cc4a7fed83c8ed42b52 (patch) | |
| tree | 866c24d9e96f8f801c8fc1a5ec512a440a1ae349 /drivers/gpu/drm/sti/Makefile | |
| parent | drm: sti: add VID layer (diff) | |
| download | linux-dev-e21e21939ce0031c11605cc4a7fed83c8ed42b52.tar.xz linux-dev-e21e21939ce0031c11605cc4a7fed83c8ed42b52.zip | |
drm: sti: add Mixer
Mixer hardware IP is responsible of mixing the different inputs layers.
Z-order is managed by the mixer.
We could 2 mixers: one for main path and one for auxillary path
Mixers are part of Compositor hardware block
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/sti/Makefile')
| -rw-r--r-- | drivers/gpu/drm/sti/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/Makefile b/drivers/gpu/drm/sti/Makefile index 9b613d24877f..4a3a8168c30e 100644 --- a/drivers/gpu/drm/sti/Makefile +++ b/drivers/gpu/drm/sti/Makefile @@ -1,4 +1,5 @@ sticompositor-y := \ + sti_mixer.o \ sti_gdp.o \ sti_vid.o @@ -12,4 +13,4 @@ obj-$(CONFIG_DRM_STI) = \ stihdmi.o \ sti_hda.o \ sti_tvout.o \ - sticompositor.o + sticompositor.o
\ No newline at end of file |