Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea4d5ec authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: Pass the encoder DT node to rcar_du_encoder_init() 



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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 2378ad12

drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/rcar-du/rcar_du_encoder.h

+2 −1
Original line number Diff line number Diff line
@@ -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__ */

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -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);