summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/sti/sti_compositor.h
diff options
context:
space:
mode:
authorFabien Dessenne2016-09-06 09:42:25 +0200
committerVincent Abriou2016-09-20 11:32:06 +0200
commitffdbb82ca4e01b468871dc683e6c3ae169995f0a (patch)
tree487c25b7b58ae393d36633ed8b4eb078d089dbd8 /drivers/gpu/drm/sti/sti_compositor.h
parentdrm/sti: use different notifier_block for each pipe (diff)
downloadkernel-qcow2-linux-ffdbb82ca4e01b468871dc683e6c3ae169995f0a.tar.gz
kernel-qcow2-linux-ffdbb82ca4e01b468871dc683e6c3ae169995f0a.tar.xz
kernel-qcow2-linux-ffdbb82ca4e01b468871dc683e6c3ae169995f0a.zip
drm/sti: use vtg array instead of vtg_main/aux
This is more generic and more consistent with the other members of the sti_compositor struct. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> Acked-by: Vincent Abriou <vincent.abriou@st.com>
Diffstat (limited to 'drivers/gpu/drm/sti/sti_compositor.h')
-rw-r--r--drivers/gpu/drm/sti/sti_compositor.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h
index 177c57b74006..c9e7e3bf183e 100644
--- a/drivers/gpu/drm/sti/sti_compositor.h
+++ b/drivers/gpu/drm/sti/sti_compositor.h
@@ -60,8 +60,7 @@ struct sti_compositor_data {
* @rst_aux: reset control of the aux path
* @mixer: array of mixers
* @vid: array of vids
- * @vtg_main: vtg for main data path
- * @vtg_aux: vtg for auxillary data path
+ * @vtg: array of vtgs
* @vtg_vblank_nb: array of callbacks for VTG VSYNC notification
*/
struct sti_compositor {
@@ -76,8 +75,7 @@ struct sti_compositor {
struct reset_control *rst_aux;
struct sti_mixer *mixer[STI_MAX_MIXER];
struct sti_vid *vid[STI_MAX_VID];
- struct sti_vtg *vtg_main;
- struct sti_vtg *vtg_aux;
+ struct sti_vtg *vtg[STI_MAX_MIXER];
struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
};