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

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



Renesas display drivers changes for v5.1:

- R8A774C0 support
- D3/E3 RGB output routing fixes
- Miscellaneous fixes
- Constify drm_bridge .mode_set() arguments

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

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1743477.dgErSCK0Q8@avalon
parents e3d09307 9a47db8e

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

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 


- compatible : Shall contain one of

  - "renesas,r8a7743-lvds" for R8A7743 (RZ/G1M) 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

  - "renesas,r8a7793-lvds" for R8A7793 (R-Car M2-N) compatible LVDS encoders
@@ -25,7 +26,7 @@ Required properties: 
- clock-names: Name of the clocks. This property is model-dependent.

  - The functional clock, which mandatory for all models, shall be listed

    first, and shall be named "fck".

  - On R8A77990 and R8A77995, the LVDS encoder can use the EXTAL or

  - On R8A77990, R8A77995 and R8A774C0, the LVDS encoder can use the EXTAL or

    DU_DOTCLKINx clocks. Those clocks are optional. When supplied they must be

    named "extal" and "dclkin.x" respectively, with "x" being the DU_DOTCLKIN

    numerical index.

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

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required Properties: 
    - "renesas,du-r8a7744" for R8A7744 (RZ/G1N) compatible DU

    - "renesas,du-r8a7745" for R8A7745 (RZ/G1E) compatible DU

    - "renesas,du-r8a77470" for R8A77470 (RZ/G1C) 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

    - "renesas,du-r8a7791" for R8A7791 (R-Car M2-W) compatible DU
@@ -57,6 +58,7 @@ corresponding to each DU output. 
 R8A7744 (RZ/G1N)       DPAD 0         LVDS 0         -              -

 R8A7745 (RZ/G1E)       DPAD 0         DPAD 1         -              -

 R8A77470 (RZ/G1C)      DPAD 0         DPAD 1         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         -

 R8A7791 (R-Car M2-W)   DPAD 0         LVDS 0         -              -

drivers/gpu/drm/bridge/adv7511/adv7511.h

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) 
#ifdef CONFIG_DRM_I2C_ADV7533

void adv7533_dsi_power_on(struct adv7511 *adv);

void adv7533_dsi_power_off(struct adv7511 *adv);

void adv7533_mode_set(struct adv7511 *adv, struct drm_display_mode *mode);

void adv7533_mode_set(struct adv7511 *adv, const struct drm_display_mode *mode);

int adv7533_patch_registers(struct adv7511 *adv);

int adv7533_patch_cec_registers(struct adv7511 *adv);

int adv7533_attach_dsi(struct adv7511 *adv);
@@ -411,7 +411,7 @@ static inline void adv7533_dsi_power_off(struct adv7511 *adv) 
}



static inline void adv7533_mode_set(struct adv7511 *adv,

				    struct drm_display_mode *mode)

				    const struct drm_display_mode *mode)

{

}

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -676,8 +676,8 @@ static enum drm_mode_status adv7511_mode_valid(struct adv7511 *adv7511, 
}



static void adv7511_mode_set(struct adv7511 *adv7511,

			     struct drm_display_mode *mode,

			     struct drm_display_mode *adj_mode)

			     const struct drm_display_mode *mode,

			     const struct drm_display_mode *adj_mode)

{

	unsigned int low_refresh_rate;

	unsigned int hsync_polarity = 0;
@@ -839,8 +839,8 @@ static void adv7511_bridge_disable(struct drm_bridge *bridge) 
}



static void adv7511_bridge_mode_set(struct drm_bridge *bridge,

				    struct drm_display_mode *mode,

				    struct drm_display_mode *adj_mode)

				    const struct drm_display_mode *mode,

				    const struct drm_display_mode *adj_mode)

{

	struct adv7511 *adv = bridge_to_adv7511(bridge);

drivers/gpu/drm/bridge/adv7511/adv7533.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void adv7533_dsi_power_off(struct adv7511 *adv) 
	regmap_write(adv->regmap_cec, 0x27, 0x0b);

}



void adv7533_mode_set(struct adv7511 *adv, struct drm_display_mode *mode)

void adv7533_mode_set(struct adv7511 *adv, const struct drm_display_mode *mode)

{

	struct mipi_dsi_device *dsi = adv->dsi;

	int lanes, ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE