diff options
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.c | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h index a7194812997e..15871fae7445 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * rcar_du_crtc.h -- R-Car Display Unit CRTCs | 2 | * rcar_du_crtc.h -- R-Car Display Unit CRTCs |
3 | * | 3 | * |
4 | * Copyright (C) 2013-2014 Renesas Electronics Corporation | 4 | * Copyright (C) 2013-2015 Renesas Electronics Corporation |
5 | * | 5 | * |
6 | * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) | 6 | * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) |
7 | * | 7 | * |
@@ -61,6 +61,8 @@ enum rcar_du_output { | |||
61 | RCAR_DU_OUTPUT_DPAD1, | 61 | RCAR_DU_OUTPUT_DPAD1, |
62 | RCAR_DU_OUTPUT_LVDS0, | 62 | RCAR_DU_OUTPUT_LVDS0, |
63 | RCAR_DU_OUTPUT_LVDS1, | 63 | RCAR_DU_OUTPUT_LVDS1, |
64 | RCAR_DU_OUTPUT_HDMI0, | ||
65 | RCAR_DU_OUTPUT_HDMI1, | ||
64 | RCAR_DU_OUTPUT_TCON, | 66 | RCAR_DU_OUTPUT_TCON, |
65 | RCAR_DU_OUTPUT_MAX, | 67 | RCAR_DU_OUTPUT_MAX, |
66 | }; | 68 | }; |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 709f343dbe7f..d6a0255181cc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c | |||
@@ -149,13 +149,21 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = { | |||
149 | | RCAR_DU_FEATURE_VSP1_SOURCE, | 149 | | RCAR_DU_FEATURE_VSP1_SOURCE, |
150 | .num_crtcs = 4, | 150 | .num_crtcs = 4, |
151 | .routes = { | 151 | .routes = { |
152 | /* R8A7795 has one RGB output, one LVDS output and two | 152 | /* R8A7795 has one RGB output, two HDMI outputs and one |
153 | * (currently unsupported) HDMI outputs. | 153 | * LVDS output. |
154 | */ | 154 | */ |
155 | [RCAR_DU_OUTPUT_DPAD0] = { | 155 | [RCAR_DU_OUTPUT_DPAD0] = { |
156 | .possible_crtcs = BIT(3), | 156 | .possible_crtcs = BIT(3), |
157 | .port = 0, | 157 | .port = 0, |
158 | }, | 158 | }, |
159 | [RCAR_DU_OUTPUT_HDMI0] = { | ||
160 | .possible_crtcs = BIT(1), | ||
161 | .port = 1, | ||
162 | }, | ||
163 | [RCAR_DU_OUTPUT_HDMI1] = { | ||
164 | .possible_crtcs = BIT(2), | ||
165 | .port = 2, | ||
166 | }, | ||
159 | [RCAR_DU_OUTPUT_LVDS0] = { | 167 | [RCAR_DU_OUTPUT_LVDS0] = { |
160 | .possible_crtcs = BIT(0), | 168 | .possible_crtcs = BIT(0), |
161 | .port = 3, | 169 | .port = 3, |