From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham@ideasonboard.com>, Jacopo Mondi <jacopo+renesas@jmondi.org> Subject: [PATCH v3 07/10] drm: rcar-du: Skip LVDS1 output on Gen3 when using dual-link LVDS mode Date: Tue, 28 May 2019 17:12:31 +0300 [thread overview] Message-ID: <20190528141234.15425-8-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20190528141234.15425-1-laurent.pinchart+renesas@ideasonboard.com> In dual-link LVDS mode, the LVDS1 encoder is used as a companion for LVDS0, and both encoders transmit data from DU0. The LVDS1 output of DU1 can't be used in that case, don't create an encoder and connector for it. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- Changess since v2: - Remove unneeded bridge NULL check --- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 ++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index 6c91753af7bc..0f00bdfe2366 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -16,6 +16,7 @@ #include "rcar_du_drv.h" #include "rcar_du_encoder.h" #include "rcar_du_kms.h" +#include "rcar_lvds.h" /* ----------------------------------------------------------------------------- * Encoder @@ -97,6 +98,17 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, } } + /* + * On Gen3 skip the LVDS1 output if the LVDS1 encoder is used as a + * companion for LVDS0 in dual-link mode. + */ + if (rcdu->info->gen >= 3 && output == RCAR_DU_OUTPUT_LVDS1) { + if (rcar_lvds_dual_link(bridge)) { + ret = -ENOLINK; + goto done; + } + } + ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); if (ret < 0) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index f8f7fff34dff..95c81e59e2f1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -378,7 +378,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, } ret = rcar_du_encoder_init(rcdu, output, entity); - if (ret && ret != -EPROBE_DEFER) + if (ret && ret != -EPROBE_DEFER && ret != -ENOLINK) dev_warn(rcdu->dev, "failed to initialize encoder %pOF on output %u (%d), skipping\n", entity, output, ret); -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Jacopo Mondi <jacopo+renesas@jmondi.org>, Kieran Bingham <kieran.bingham@ideasonboard.com> Subject: [PATCH v3 07/10] drm: rcar-du: Skip LVDS1 output on Gen3 when using dual-link LVDS mode Date: Tue, 28 May 2019 17:12:31 +0300 [thread overview] Message-ID: <20190528141234.15425-8-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20190528141234.15425-1-laurent.pinchart+renesas@ideasonboard.com> In dual-link LVDS mode, the LVDS1 encoder is used as a companion for LVDS0, and both encoders transmit data from DU0. The LVDS1 output of DU1 can't be used in that case, don't create an encoder and connector for it. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- Changess since v2: - Remove unneeded bridge NULL check --- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 ++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index 6c91753af7bc..0f00bdfe2366 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -16,6 +16,7 @@ #include "rcar_du_drv.h" #include "rcar_du_encoder.h" #include "rcar_du_kms.h" +#include "rcar_lvds.h" /* ----------------------------------------------------------------------------- * Encoder @@ -97,6 +98,17 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, } } + /* + * On Gen3 skip the LVDS1 output if the LVDS1 encoder is used as a + * companion for LVDS0 in dual-link mode. + */ + if (rcdu->info->gen >= 3 && output == RCAR_DU_OUTPUT_LVDS1) { + if (rcar_lvds_dual_link(bridge)) { + ret = -ENOLINK; + goto done; + } + } + ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); if (ret < 0) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index f8f7fff34dff..95c81e59e2f1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -378,7 +378,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, } ret = rcar_du_encoder_init(rcdu, output, entity); - if (ret && ret != -EPROBE_DEFER) + if (ret && ret != -EPROBE_DEFER && ret != -ENOLINK) dev_warn(rcdu->dev, "failed to initialize encoder %pOF on output %u (%d), skipping\n", entity, output, ret); -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-05-28 14:13 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-28 14:12 [PATCH v3 00/10] R-Car DU: LVDS dual-link mode support Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 01/10] drm: bridge: Add dual_link field to the drm_bridge_timings structure Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-07-30 12:12 ` Neil Armstrong 2019-07-30 12:12 ` Neil Armstrong 2019-05-28 14:12 ` [PATCH v3 02/10] dt-bindings: display: bridge: thc63lvd1024: Document dual-link operation Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 22:15 ` Kieran Bingham 2019-06-07 22:15 ` Kieran Bingham 2019-06-07 22:30 ` Laurent Pinchart 2019-06-07 22:30 ` Laurent Pinchart 2019-06-07 22:36 ` Kieran Bingham 2019-06-07 22:36 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 03/10] drm: bridge: thc63: Report input bus mode through bridge timings Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 22:51 ` Kieran Bingham 2019-06-07 22:51 ` Kieran Bingham 2019-07-30 12:13 ` Neil Armstrong 2019-07-30 12:13 ` Neil Armstrong 2019-05-28 14:12 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas, companion property Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas,companion property Laurent Pinchart 2019-05-28 16:37 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas, companion property Sam Ravnborg 2019-05-28 16:37 ` Sam Ravnborg 2019-05-28 16:49 ` Laurent Pinchart 2019-05-28 16:49 ` Laurent Pinchart 2019-05-28 16:59 ` Sam Ravnborg 2019-05-28 16:59 ` Sam Ravnborg 2019-06-06 7:54 ` Laurent Pinchart 2019-06-06 7:54 ` Laurent Pinchart 2019-06-06 9:27 ` Sam Ravnborg 2019-06-06 9:27 ` Sam Ravnborg 2019-06-07 22:33 ` [PATCH v3 04/10] dt-bindings: display: renesas: lvds: Add renesas,companion property Kieran Bingham 2019-06-07 22:33 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 05/10] drm: rcar-du: lvds: Remove LVDS double-enable checks Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 22:09 ` Kieran Bingham 2019-06-07 22:09 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 06/10] drm: rcar-du: lvds: Add support for dual-link mode Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-07 23:11 ` Kieran Bingham 2019-06-07 23:11 ` Kieran Bingham 2019-05-28 14:12 ` Laurent Pinchart [this message] 2019-05-28 14:12 ` [PATCH v3 07/10] drm: rcar-du: Skip LVDS1 output on Gen3 when using dual-link LVDS mode Laurent Pinchart 2019-05-28 16:42 ` Sam Ravnborg 2019-05-28 16:42 ` Sam Ravnborg 2019-05-28 16:50 ` Laurent Pinchart 2019-05-28 16:50 ` Laurent Pinchart 2019-05-28 17:02 ` Sam Ravnborg 2019-05-28 17:02 ` Sam Ravnborg 2019-06-06 7:57 ` Laurent Pinchart 2019-06-06 7:57 ` Laurent Pinchart 2019-06-06 9:29 ` Sam Ravnborg 2019-06-06 9:29 ` Sam Ravnborg 2019-06-07 23:19 ` Kieran Bingham 2019-06-07 23:19 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 08/10] arm64: dts: renesas: r8a7799[05]: Point LVDS0 to its companion LVDS1 Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-06-03 11:40 ` Simon Horman 2019-06-03 11:40 ` Simon Horman 2019-06-06 7:59 ` Laurent Pinchart 2019-06-06 7:59 ` Laurent Pinchart 2019-06-06 8:51 ` Simon Horman 2019-06-06 8:51 ` Simon Horman 2019-06-12 10:21 ` Laurent Pinchart 2019-06-12 10:21 ` Laurent Pinchart 2019-06-12 11:52 ` Simon Horman 2019-06-12 11:52 ` Simon Horman 2019-06-07 23:15 ` Kieran Bingham 2019-06-07 23:15 ` Kieran Bingham 2019-05-28 14:12 ` [PATCH v3 09/10] [HACK] arm64: dts: renesas: draak: Enable LVDS dual-link operation Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-05-28 14:12 ` [PATCH v3 10/10] [HACK] arm64: dts: renesas: ebisu: " Laurent Pinchart 2019-05-28 14:12 ` Laurent Pinchart 2019-07-22 11:27 ` Fabrizio Castro 2019-07-22 11:27 ` Fabrizio Castro 2019-07-23 10:30 ` Jacopo Mondi 2019-07-23 10:30 ` Jacopo Mondi 2019-07-23 12:16 ` Fabrizio Castro 2019-07-23 12:16 ` Fabrizio Castro 2019-05-28 16:46 ` [PATCH v3 00/10] R-Car DU: LVDS dual-link mode support Sam Ravnborg 2019-05-28 16:46 ` Sam Ravnborg 2019-06-07 22:16 ` Kieran Bingham 2019-06-07 22:16 ` Kieran Bingham 2019-06-07 22:21 ` Laurent Pinchart 2019-06-07 22:21 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190528141234.15425-8-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jacopo+renesas@jmondi.org \ --cc=kieran.bingham@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.