| From 23f501fe5138974473d0d042758d268c9f627fe1 Mon Sep 17 00:00:00 2001 |
| From: Koji Matsuoka <koji.matsuoka.xm@renesas.com> |
| Date: Fri, 11 Nov 2016 18:07:39 +0100 |
| Subject: [PATCH 264/286] drm: rcar-du: Add HDMI outputs to R8A7795 device |
| description |
| |
| Update the device description with the two available HDMI outputs. |
| |
| Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com> |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 0dda563e571093f309d597cafaf7dd535496ecfb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 +++- |
| drivers/gpu/drm/rcar-du/rcar_du_drv.c | 12 ++++++++++-- |
| 2 files changed, 13 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h |
| @@ -1,7 +1,7 @@ |
| /* |
| * rcar_du_crtc.h -- R-Car Display Unit CRTCs |
| * |
| - * Copyright (C) 2013-2014 Renesas Electronics Corporation |
| + * Copyright (C) 2013-2015 Renesas Electronics Corporation |
| * |
| * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) |
| * |
| @@ -61,6 +61,8 @@ enum rcar_du_output { |
| RCAR_DU_OUTPUT_DPAD1, |
| RCAR_DU_OUTPUT_LVDS0, |
| RCAR_DU_OUTPUT_LVDS1, |
| + RCAR_DU_OUTPUT_HDMI0, |
| + RCAR_DU_OUTPUT_HDMI1, |
| RCAR_DU_OUTPUT_TCON, |
| RCAR_DU_OUTPUT_MAX, |
| }; |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c |
| @@ -150,13 +150,21 @@ static const struct rcar_du_device_info |
| | RCAR_DU_FEATURE_VSP1_SOURCE, |
| .num_crtcs = 4, |
| .routes = { |
| - /* R8A7795 has one RGB output, one LVDS output and two |
| - * (currently unsupported) HDMI outputs. |
| + /* R8A7795 has one RGB output, two HDMI outputs and one |
| + * LVDS output. |
| */ |
| [RCAR_DU_OUTPUT_DPAD0] = { |
| .possible_crtcs = BIT(3), |
| .port = 0, |
| }, |
| + [RCAR_DU_OUTPUT_HDMI0] = { |
| + .possible_crtcs = BIT(1), |
| + .port = 1, |
| + }, |
| + [RCAR_DU_OUTPUT_HDMI1] = { |
| + .possible_crtcs = BIT(2), |
| + .port = 2, |
| + }, |
| [RCAR_DU_OUTPUT_LVDS0] = { |
| .possible_crtcs = BIT(0), |
| .port = 3, |
