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

Commit 0320ac51 authored Sep 20, 2018 by Dave Airlie

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



R-Car DU changes for v4.20

The pull request mostly contains updates to the R-Car DU driver, notably
support for interlaced modes on Gen3 hardware, support for the LVDS output on
R8A77980, and a set of miscellaneous bug fixes. There are also two SPDX
conversion patches for the drm shmobile and panel-lvds drivers, as well as an
update to MAINTAINERS to add Kieran Bingham as a co-maintainer for the DU
driver.

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

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3273568.LdoAI77IYW@avalon

parents 79524104 6e1637c9

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ Required properties:
		- "renesas,r8a7795-lvds" for R8A7795 (R-Car H3) compatible LVDS encoders
		- "renesas,r8a7796-lvds" for R8A7796 (R-Car M3-W) compatible LVDS encoders
		- "renesas,r8a77970-lvds" for R8A77970 (R-Car V3M) compatible LVDS encoders
		- "renesas,r8a77980-lvds" for R8A77980 (R-Car V3H) compatible LVDS encoders
		- "renesas,r8a77995-lvds" for R8A77995 (R-Car D3) compatible LVDS encoders

		- reg: Base address and length for the memory-mapped registers

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ Required Properties:
		- "renesas,du-r8a7796" for R8A7796 (R-Car M3-W) compatible DU
		- "renesas,du-r8a77965" for R8A77965 (R-Car M3-N) compatible DU
		- "renesas,du-r8a77970" for R8A77970 (R-Car V3M) compatible DU
		- "renesas,du-r8a77980" for R8A77980 (R-Car V3H) compatible DU
		- "renesas,du-r8a77995" for R8A77995 (R-Car D3) compatible DU

		- reg: the memory-mapped I/O registers base address and length
		@@ -61,6 +62,7 @@ corresponding to each DU output.
		R8A7796 (R-Car M3-W) DPAD 0 HDMI 0 LVDS 0 -
		R8A77965 (R-Car M3-N) DPAD 0 HDMI 0 LVDS 0 -
		R8A77970 (R-Car V3M) DPAD 0 LVDS 0 - -
		R8A77980 (R-Car V3H) DPAD 0 LVDS 0 - -
		R8A77995 (R-Car D3) DPAD 0 LVDS 0 LVDS 1 -

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -4870,9 +4870,10 @@ F: Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt

		DRM DRIVERS FOR RENESAS
		M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		M: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
		L: dri-devel@lists.freedesktop.org
		L: linux-renesas-soc@vger.kernel.org
		T: git git://linuxtv.org/pinchartl/fbdev
		T: git git://linuxtv.org/pinchartl/media drm/du/next
		S: Supported
		F: drivers/gpu/drm/rcar-du/
		F: drivers/gpu/drm/shmobile/

drivers/gpu/drm/panel/panel-lvds.c

+1 −5

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0+
		/*
		* Generic LVDS panel driver
		*
		@@ -5,11 +6,6 @@
		* Copyright (C) 2016 Renesas Electronics Corporation
		*
		* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*/

		#include <linux/backlight.h>

drivers/gpu/drm/rcar-du/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		config DRM_RCAR_DU
		tristate "DRM Support for R-Car Display Unit"
		depends on DRM && OF