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

Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next 

A bit smaller pull this time.  Few minor things, plus initial support
for msm8996 (snapdragon 820)..  Sorry, a bit latish, was hoping to get
some 8960/8064 DSI stuff included.  But still waiting on the v2 of the
patchset (just pending some minor review comments).  It would be nice
to get the DSI patches merged since it would help some folks trying to
get upstream kernel running on n4/n7 and xperia z and wanting to write
some more panel drivers.  Also, waiting for OCMEM driver to get merged
via other trees and then I have a small bit to go along with that to
make the gpu actually work on devices w/ OCMEM (snapdragon 800, 805,
etc).  So maybe a second later pull req, time permitting.

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: Remove local fbdev emulation Kconfig option
  drm/msm/mdp5: Basic support for MDP5 v1.7 (MSM8996)
  drm/msm/mdp: Add Software Pixel Extension support
  drm/msm/mdp5: Use the newly introduced enum mdp_component_type
  drm/msm/hdmi: Add basic HDMI support for msm8996
  drm/msm/mdp5: Avoid printing error messages for optional clocks
  drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails
  drm/msm/mdp5: remove the cfg pointer from SMP struct
  drm/msm/dsi: Updata LNn_CFG4 register settings for 28nm PHY
  drm: msm: dsi: Don't attempt changing voltage of switches
  drm/msm: update generated headers
parents 2b5f900e a9ee34b7

Documentation/devicetree/bindings/drm/msm/hdmi.txt

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Qualcomm adreno/snapdragon hdmi output 


Required properties:

- compatible: one of the following

   * "qcom,hdmi-tx-8996"

   * "qcom,hdmi-tx-8994"

   * "qcom,hdmi-tx-8084"

   * "qcom,hdmi-tx-8974"
@@ -21,6 +22,7 @@ Required properties: 
Optional properties:

- qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin

- qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin

- power-domains: reference to the power domain(s), if available.

- pinctrl-names: the pin control state names; should contain "default"

- pinctrl-0: the default pinctrl state (active)

- pinctrl-1: the "sleep" pinctrl state
@@ -35,6 +37,7 @@ Example: 
		reg-names = "core_physical";

		reg = <0x04a00000 0x1000>;

		interrupts = <GIC_SPI 79 0>;

		power-domains = <&mmcc MDSS_GDSC>;

		clock-names =

		    "core_clk",

		    "master_iface_clk",

Documentation/devicetree/bindings/drm/msm/mdp.txt

+2 −1
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ Required properties: 
- clock-names: the following clocks are required:

  * "core_clk"

  * "iface_clk"

  * "lut_clk"

  * "src_clk"

  * "hdmi_clk"

  * "mpd_clk"



Optional properties:

- gpus: phandle for gpu device

- clock-names: the following clocks are optional:

  * "lut_clk"



Example:

drivers/gpu/drm/msm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -14,20 +14,6 @@ config DRM_MSM 
	help

	  DRM/KMS driver for MSM/snapdragon.



config DRM_MSM_FBDEV

	bool "Enable legacy fbdev support for MSM modesetting driver"

	depends on DRM_MSM

	select DRM_KMS_FB_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select FB_SYS_FOPS

	default y

	help

	  Choose this option if you have a need for the legacy fbdev

	  support. Note that this support also provide the linux console

	  support on top of the MSM modesetting driver.



config DRM_MSM_REGISTER_LOGGING

	bool "MSM DRM register logging"

	depends on DRM_MSM

drivers/gpu/drm/msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ msm-y := \ 
	msm_rd.o \

	msm_ringbuffer.o



msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o

msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o

msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o



msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \

drivers/gpu/drm/msm/adreno/a2xx.xml.h

+5 −4
Original line number Diff line number Diff line
@@ -8,13 +8,14 @@ http://github.com/freedreno/envytools/ 
git clone https://github.com/freedreno/envytools.git



The rules-ng-ng source files this header was generated from are:

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2015-05-20 20:03:07)

- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    398 bytes, from 2015-09-24 17:25:31)

- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2015-05-20 20:03:07)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2015-05-20 20:03:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10551 bytes, from 2015-05-20 20:03:14)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10755 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14968 bytes, from 2015-05-20 20:12:27)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  67120 bytes, from 2015-08-14 23:22:03)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  63785 bytes, from 2015-08-14 18:27:06)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  67771 bytes, from 2015-09-14 20:46:55)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  63970 bytes, from 2015-09-14 20:50:12)

- /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)



Copyright (C) 2013-2015 by the following authors:

- Rob Clark <robdclark@gmail.com> (robclark)

CRA Git | Maintained and supported by SUSTech CRA and CCSE