Commit 2b534e90 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2021-12-26' of ssh://gitlab.freedesktop.org/drm/msm into drm-next 



* dpu plane state cleanup in prep for multirect
* dpu debugfs cleanup (and moving things to atomic_print_state) in prep
  for multirect
* dp support for sc7280
* struct_mutex removal
* include more GMU state in gpu devcore dumps
* add support for a506
* remove old eDP sub-driver (never was used in any upstream supported
  devices and modern things with eDP will use DP sub-driver instead)
* debugfs to disable hw gpu hang detect for (igt tests)
* debugfs for dumping display hw state
* and the usual assortment of cleanup and bug fixes

There still seems to be a timing issue with dpu, showing up on sc7180
devices, after the bridge probe-order change. Ie. things work great if
loglevel is high enough (or enough debug options are enabled, etc).
We'll continue to debug this in the new year.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGs+vwr0nkwgYzuYAsCoHtypWpWav+yVvLZGsEJy8tJ56A@mail.gmail.com
parents 040bf2a9 6ed95285

.mailmap

+8 −0
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ 
# Please keep this list dictionary sorted.

#

Aaron Durbin <adurbin@google.com>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>

Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -172,6 +174,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com> 
Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -191,6 +194,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -202,9 +206,11 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@ -311,6 +317,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com> 
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -325,6 +332,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt> 
Sachin P Sant <ssant@in.ibm.com>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ properties: 
  compatible:

    enum:

      - qcom,sc7180-dp

      - qcom,sc7280-dp

      - qcom,sc7280-edp

      - qcom,sc8180x-dp

      - qcom,sc8180x-edp

Documentation/devicetree/bindings/display/msm/edp.txt

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
Qualcomm Technologies Inc. adreno/snapdragon eDP output



Required properties:

- compatible:

  * "qcom,mdss-edp"

- reg: Physical base address and length of the registers of controller and PLL

- reg-names: The names of register regions. The following regions are required:

  * "edp"

  * "pll_base"

- interrupts: The interrupt signal from the eDP block.

- power-domains: Should be <&mmcc MDSS_GDSC>.

- clocks: device clocks

  See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.

- clock-names: the following clocks are required:

  * "core"

  * "iface"

  * "mdp_core"

  * "pixel"

  * "link"

- #clock-cells: The value should be 1.

- vdda-supply: phandle to vdda regulator device node

- lvl-vdd-supply: phandle to regulator device node which is used to supply power

  to HPD receiving chip

- panel-en-gpios: GPIO pin to supply power to panel.

- panel-hpd-gpios: GPIO pin used for eDP hpd.





Example:

	mdss_edp: qcom,mdss_edp@fd923400 {

			compatible = "qcom,mdss-edp";

			reg-names =

				"edp",

				"pll_base";

			reg =	<0xfd923400 0x700>,

				<0xfd923a00 0xd4>;

			interrupt-parent = <&mdss_mdp>;

			interrupts = <12 0>;

			power-domains = <&mmcc MDSS_GDSC>;

			clock-names =

				"core",

				"pixel",

				"iface",

				"link",

				"mdp_core";

			clocks =

				<&mmcc MDSS_EDPAUX_CLK>,

				<&mmcc MDSS_EDPPIXEL_CLK>,

				<&mmcc MDSS_AHB_CLK>,

				<&mmcc MDSS_EDPLINK_CLK>,

				<&mmcc MDSS_MDP_CLK>;

			#clock-cells = <1>;

			vdda-supply = <&pma8084_l12>;

			lvl-vdd-supply = <&lvl_vreg>;

			panel-en-gpios = <&tlmm 137 0>;

			panel-hpd-gpios = <&tlmm 103 0>;

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6050,6 +6050,7 @@ F: drivers/gpu/drm/tiny/mi0283qt.c 
DRM DRIVER FOR MSM ADRENO GPU

M:	Rob Clark <robdclark@gmail.com>

M:	Sean Paul <sean@poorly.run>

R:	Abhinav Kumar <quic_abhinavk@quicinc.com>

L:	linux-arm-msm@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

L:	freedreno@lists.freedesktop.org

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ config DRM_MSM_HDMI_HDCP 
config DRM_MSM_DP

	bool "Enable DisplayPort support in MSM DRM driver"

	depends on DRM_MSM

	select RATIONAL

	default y

	help

	  Compile in support for DP driver in MSM DRM driver. DP external