diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-12-18 16:19:26 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-12-18 16:19:26 +0100 |
| commit | 66af4a9ddac62a2614af5ce80169b6421b5c2d95 (patch) | |
| tree | 91568f17d3d2c7d3743d23be0209f98563da0e81 /drivers/gpu/drm/rcar-du/rcar_du_drv.h | |
| parent | be452c4e8d1434a0095a9baa6523bb9772258d59 (diff) | |
| parent | c267782c5f0efbd20c560101738e68bb30d4fad5 (diff) | |
Merge tag 'du-next-20191218' of git://linuxtv.org/pinchartl/media into drm-next
R-Car Display Unit changes:
- Color Management Module support
- LVDS encoder dual-link support enhancements
- R8A77980 support
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191218151710.GA13830@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/rcar-du/rcar_du_drv.h')
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 1327cd0df90a..61504c54e2ec 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/wait.h> +#include "rcar_cmm.h" #include "rcar_du_crtc.h" #include "rcar_du_group.h" #include "rcar_du_vsp.h" @@ -85,6 +86,7 @@ struct rcar_du_device { struct rcar_du_encoder *encoders[RCAR_DU_OUTPUT_MAX]; struct rcar_du_group groups[RCAR_DU_MAX_GROUPS]; + struct platform_device *cmms[RCAR_DU_MAX_CRTCS]; struct rcar_du_vsp vsps[RCAR_DU_MAX_VSPS]; struct { |