Commit f1b4a921 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'du-next-20191016' of git://linuxtv.org/pinchartl/media into drm-next 



- R-Car DU support for R8A774B1 SoC
- R-Car DU fixes for H2 ES2.0 and later revisions

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191015215116.GF19403@pendragon.ideasonboard.com
parents 400e9134 f3a36d46

Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 


- compatible : Shall contain one or more of

  - "renesas,r8a774a1-hdmi" for R8A774A1 (RZ/G2M) compatible HDMI TX

  - "renesas,r8a774b1-hdmi" for R8A774B1 (RZ/G2N) compatible HDMI TX

  - "renesas,r8a7795-hdmi" for R8A7795 (R-Car H3) compatible HDMI TX

  - "renesas,r8a7796-hdmi" for R8A7796 (R-Car M3-W) compatible HDMI TX

  - "renesas,r8a77965-hdmi" for R8A77965 (R-Car M3-N) compatible HDMI TX

Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  - "renesas,r8a7743-lvds" for R8A7743 (RZ/G1M) compatible LVDS encoders

  - "renesas,r8a7744-lvds" for R8A7744 (RZ/G1N) compatible LVDS encoders

  - "renesas,r8a774a1-lvds" for R8A774A1 (RZ/G2M) compatible LVDS encoders

  - "renesas,r8a774b1-lvds" for R8A774B1 (RZ/G2N) compatible LVDS encoders

  - "renesas,r8a774c0-lvds" for R8A774C0 (RZ/G2E) compatible LVDS encoders

  - "renesas,r8a7790-lvds" for R8A7790 (R-Car H2) compatible LVDS encoders

  - "renesas,r8a7791-lvds" for R8A7791 (R-Car M2-W) compatible LVDS encoders

Documentation/devicetree/bindings/display/renesas,du.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required Properties: 
    - "renesas,du-r8a7745" for R8A7745 (RZ/G1E) compatible DU

    - "renesas,du-r8a77470" for R8A77470 (RZ/G1C) compatible DU

    - "renesas,du-r8a774a1" for R8A774A1 (RZ/G2M) compatible DU

    - "renesas,du-r8a774b1" for R8A774B1 (RZ/G2N) compatible DU

    - "renesas,du-r8a774c0" for R8A774C0 (RZ/G2E) compatible DU

    - "renesas,du-r8a7779" for R8A7779 (R-Car H1) compatible DU

    - "renesas,du-r8a7790" for R8A7790 (R-Car H2) compatible DU
@@ -60,6 +61,7 @@ corresponding to each DU output. 
 R8A7745 (RZ/G1E)       DPAD 0         DPAD 1         -              -

 R8A77470 (RZ/G1C)      DPAD 0         DPAD 1         LVDS 0         -

 R8A774A1 (RZ/G2M)      DPAD 0         HDMI 0         LVDS 0         -

 R8A774B1 (RZ/G2N)      DPAD 0         HDMI 0         LVDS 0         -

 R8A774C0 (RZ/G2E)      DPAD 0         LVDS 0         LVDS 1         -

 R8A7779 (R-Car H1)     DPAD 0         DPAD 1         -              -

 R8A7790 (R-Car H2)     DPAD 0         LVDS 0         LVDS 1         -

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

+30 −0
Original line number Diff line number Diff line
@@ -131,6 +131,35 @@ static const struct rcar_du_device_info rcar_du_r8a774a1_info = { 
	.dpll_mask =  BIT(1),

};



static const struct rcar_du_device_info rcar_du_r8a774b1_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_VSP1_SOURCE

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(3) | BIT(1) | BIT(0),

	.routes = {

		/*

		 * R8A774B1 has one RGB output, one LVDS output and one HDMI

		 * output.

		 */

		[RCAR_DU_OUTPUT_DPAD0] = {

			.possible_crtcs = BIT(2),

			.port = 0,

		},

		[RCAR_DU_OUTPUT_HDMI0] = {

			.possible_crtcs = BIT(1),

			.port = 1,

		},

		[RCAR_DU_OUTPUT_LVDS0] = {

			.possible_crtcs = BIT(0),

			.port = 2,

		},

	},

	.num_lvds = 1,

	.dpll_mask =  BIT(1),

};



static const struct rcar_du_device_info rcar_du_r8a774c0_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
@@ -416,6 +445,7 @@ static const struct of_device_id rcar_du_of_table[] = { 
	{ .compatible = "renesas,du-r8a7745", .data = &rzg1_du_r8a7745_info },

	{ .compatible = "renesas,du-r8a77470", .data = &rzg1_du_r8a77470_info },

	{ .compatible = "renesas,du-r8a774a1", .data = &rcar_du_r8a774a1_info },

	{ .compatible = "renesas,du-r8a774b1", .data = &rcar_du_r8a774b1_info },

	{ .compatible = "renesas,du-r8a774c0", .data = &rcar_du_r8a774c0_info },

	{ .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info },

	{ .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info },

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

+5 −1
Original line number Diff line number Diff line
@@ -585,7 +585,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) 


		vsps[j].crtcs_mask |= BIT(i);



		/* Store the VSP pointer and pipe index in the CRTC. */

		/*

		 * Store the VSP pointer and pipe index in the CRTC. If the

		 * second cell of the 'vsps' specifier isn't present, default

		 * to 0 to remain compatible with older DT bindings.

		 */

		rcdu->crtcs[i].vsp = &rcdu->vsps[j];

		rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE