All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-sh@vger.kernel.org
Subject: [PATCH 05/12] drm: rcar-du: Pass the encoder DT node to rcar_du_encoder_init()
Date: Wed, 24 Sep 2014 20:04:25 +0000	[thread overview]
Message-ID: <1411589072-28609-6-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1411589072-28609-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

The encoder DT node will be needed to register an external HDMI encoder.
Pass it to the rcar_du_encoder_init() function to prepare for HDMI
support.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +++--
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 ++-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index 89ed4a9..c699100 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -142,7 +142,8 @@ static const struct drm_encoder_funcs encoder_funcs = {
 int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 			 enum rcar_du_encoder_type type,
 			 enum rcar_du_output output,
-			 struct device_node *np)
+			 struct device_node *enc_node,
+			 struct device_node *con_node)
 {
 	struct rcar_du_encoder *renc;
 	unsigned int encoder_type;
@@ -190,7 +191,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 
 	switch (encoder_type) {
 	case DRM_MODE_ENCODER_LVDS:
-		return rcar_du_lvds_connector_init(rcdu, renc, np);
+		return rcar_du_lvds_connector_init(rcdu, renc, con_node);
 
 	case DRM_MODE_ENCODER_DAC:
 		return rcar_du_vga_connector_init(rcdu, renc);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
index c37ed94..4b906b9 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
@@ -49,6 +49,7 @@ rcar_du_connector_best_encoder(struct drm_connector *connector);
 int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 			 enum rcar_du_encoder_type type,
 			 enum rcar_du_output output,
-			 struct device_node *np);
+			 struct device_node *enc_node,
+			 struct device_node *con_node);
 
 #endif /* __RCAR_DU_ENCODER_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 6575681..a798294 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -289,7 +289,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 		connector = entity;
 	}
 
-	ret = rcar_du_encoder_init(rcdu, enc_type, output, connector);
+	ret = rcar_du_encoder_init(rcdu, enc_type, output, encoder, connector);
 	of_node_put(encoder);
 	of_node_put(connector);
 
-- 
1.8.5.5


WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-sh@vger.kernel.org
Subject: [PATCH 05/12] drm: rcar-du: Pass the encoder DT node to rcar_du_encoder_init()
Date: Wed, 24 Sep 2014 23:04:25 +0300	[thread overview]
Message-ID: <1411589072-28609-6-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1411589072-28609-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

The encoder DT node will be needed to register an external HDMI encoder.
Pass it to the rcar_du_encoder_init() function to prepare for HDMI
support.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +++--
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 ++-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index 89ed4a9..c699100 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -142,7 +142,8 @@ static const struct drm_encoder_funcs encoder_funcs = {
 int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 			 enum rcar_du_encoder_type type,
 			 enum rcar_du_output output,
-			 struct device_node *np)
+			 struct device_node *enc_node,
+			 struct device_node *con_node)
 {
 	struct rcar_du_encoder *renc;
 	unsigned int encoder_type;
@@ -190,7 +191,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 
 	switch (encoder_type) {
 	case DRM_MODE_ENCODER_LVDS:
-		return rcar_du_lvds_connector_init(rcdu, renc, np);
+		return rcar_du_lvds_connector_init(rcdu, renc, con_node);
 
 	case DRM_MODE_ENCODER_DAC:
 		return rcar_du_vga_connector_init(rcdu, renc);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
index c37ed94..4b906b9 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
@@ -49,6 +49,7 @@ rcar_du_connector_best_encoder(struct drm_connector *connector);
 int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 			 enum rcar_du_encoder_type type,
 			 enum rcar_du_output output,
-			 struct device_node *np);
+			 struct device_node *enc_node,
+			 struct device_node *con_node);
 
 #endif /* __RCAR_DU_ENCODER_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 6575681..a798294 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -289,7 +289,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 		connector = entity;
 	}
 
-	ret = rcar_du_encoder_init(rcdu, enc_type, output, connector);
+	ret = rcar_du_encoder_init(rcdu, enc_type, output, encoder, connector);
 	of_node_put(encoder);
 	of_node_put(connector);
 
-- 
1.8.5.5


  parent reply	other threads:[~2014-09-24 20:04 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-24 20:04 [PATCH 00/12] Renesas R-Car DU HDMI support Laurent Pinchart
2014-09-24 20:04 ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 01/12] of: Decrement refcount of previous endpoint in of_graph_get_next_endpoint Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 02/12] of: Add for_each_endpoint_of_node helper macro Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 03/12] drm: rcar-du: Remove platform data support Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 04/12] drm: rcar-du: Use for_each_endpoint_of_node() Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` Laurent Pinchart [this message]
2014-09-24 20:04   ` [PATCH 05/12] drm: rcar-du: Pass the encoder DT node to rcar_du_encoder_init() Laurent Pinchart
2014-09-24 20:04 ` [PATCH 06/12] drm: rcar-du: Replace direct DRM encoder access with cast macro Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 07/12] drm: rcar-du: Replace drm_encoder with drm_slave_encoder Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 08/12] drm: rcar-du: Add HDMI encoder and connector support Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 09/12] drm: Decouple EDID parsing from I2C adapter Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 10/12] video: Add ADV751[13] DT bindings documentation Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-25  7:06   ` Geert Uytterhoeven
2014-09-25  7:06     ` Geert Uytterhoeven
2014-09-25  9:57     ` Laurent Pinchart
2014-09-25  9:57       ` Laurent Pinchart
2014-09-25 10:10       ` Geert Uytterhoeven
2014-09-25 10:10         ` Geert Uytterhoeven
2014-09-26 12:30         ` Laurent Pinchart
2014-09-26 12:30           ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 11/12] drm: Add adv7511 encoder driver Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-09-24 20:04 ` [PATCH 12/12] ARM: shmobile: koelsch: Add DU HDMI output support Laurent Pinchart
2014-09-24 20:04   ` Laurent Pinchart
2014-10-27  0:38   ` Simon Horman
2014-10-27  0:38     ` Simon Horman
2014-10-27 12:12     ` Laurent Pinchart
2014-10-27 12:12       ` Laurent Pinchart
2014-10-27 12:30       ` Simon Horman
2015-02-06  0:58       ` Simon Horman
2015-02-06  0:58         ` Simon Horman
2015-02-08 16:08         ` Laurent Pinchart
2015-02-08 16:08           ` Laurent Pinchart
2015-02-09  5:27           ` Simon Horman
2015-02-09  5:27             ` Simon Horman
2014-09-25 13:09 ` [PATCH 00/12] Renesas R-Car DU HDMI support Philipp Zabel
2014-09-25 13:09   ` Philipp Zabel
2014-09-26 11:35   ` Laurent Pinchart
2014-09-26 11:35     ` 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=1411589072-28609-6-git-send-email-laurent.pinchart+renesas@ideasonboard.com \
    --to=laurent.pinchart+renesas@ideasonboard.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-sh@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: link
Be 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.