diff options
| author | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-07-30 21:28:27 +0400 |
|---|---|---|
| committer | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-07-30 21:28:27 +0400 |
| commit | d219673d8437ff1073c11d30ac496fa42b09662c (patch) | |
| tree | 08bef22f55cfaeea4b3f3c12e3421547ed1f490f /drivers/gpu/drm/sti/sti_mixer.c | |
| parent | e21e21939ce0031c11605cc4a7fed83c8ed42b52 (diff) | |
| download | linux-d219673d8437ff1073c11d30ac496fa42b09662c.tar.xz | |
drm: sti: add Compositor
Compositor control all the input sub-device (VID, GDP)
and the mixer(s).
It is the main entry point for composition.
Layer interface is used to control the abstracted layers.
Add debug in mixer and GDP.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/sti/sti_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_mixer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c index 5fa6dc5800aa..79f369db9fb6 100644 --- a/drivers/gpu/drm/sti/sti_mixer.c +++ b/drivers/gpu/drm/sti/sti_mixer.c @@ -6,6 +6,7 @@ * License terms: GNU General Public License (GPL), version 2 */ +#include "sti_compositor.h" #include "sti_mixer.h" #include "sti_vtg.h" @@ -133,6 +134,8 @@ int sti_mixer_set_layer_depth(struct sti_mixer *mixer, struct sti_layer *layer) mask = GAM_DEPTH_MASK_ID << (3 * depth); layer_id = layer_id << (3 * depth); + DRM_DEBUG_DRIVER("%s %s depth=%d\n", sti_mixer_to_str(mixer), + sti_layer_to_str(layer), depth); dev_dbg(mixer->dev, "GAM_MIXER_CRB val 0x%x mask 0x%x\n", layer_id, mask); @@ -195,6 +198,9 @@ int sti_mixer_set_layer_status(struct sti_mixer *mixer, { u32 mask, val; + DRM_DEBUG_DRIVER("%s %s %s\n", status ? "enable" : "disable", + sti_mixer_to_str(mixer), sti_layer_to_str(layer)); + mask = sti_mixer_get_layer_mask(layer); if (!mask) { DRM_ERROR("Can not find layer mask\n"); |