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

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



This time around, seeing some love for some older hw:

 - a2xx gpu support for apq8060 (hp touchpad) and imx5 (headless
   gpu-only mode)
 - a2xx gpummu support (a2xx was pre-iommu)
 - mdp4 display support for apq8060/touchpad

For display/dpu:

 - a big pile of continuing dpu fixes and cleanups

On the gpu side of things:

 - per-submit statistics and traceevents for better profiling
 - a6xx crashdump support
 - decouple get_iova() and page pinning.. so we can unpin from
   physical memory inactive bo's while using softpin to lower
   cpu overhead
 - new interface to set debug names on GEM BOs and debugfs
   output improvements
 - additional submit flag to indicate buffers that are used
   to dump (so $debugfs/rd cmdstream dumping is useful with
   softpin + state-objects)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvVvLPD9_Z4kyfGe98Y--byj6HbxHivEYSgF7Rq7=bFnw@mail.gmail.com
parents 02c4fb02 ba0ede18

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

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ Required properties: 
- clocks: Phandles to device clocks. See [1] for details on clock bindings.

- clock-names: the following clocks are required:

  * "iface"

  * "ref" (only required for new DTS files/entries)

  For 28nm HPM/LP, 28nm 8960 PHYs:

- vddio-supply: phandle to vdd-io regulator device node

  For 20nm PHY:

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

+3 −1
Original line number Diff line number Diff line 
Qualcomm adreno/snapdragon GPU



Required properties:

- compatible: "qcom,adreno-XYZ.W", "qcom,adreno"

- compatible: "qcom,adreno-XYZ.W", "qcom,adreno" or

	      "amd,imageon-XYZ.W", "amd,imageon"

    for example: "qcom,adreno-306.0", "qcom,adreno"

  Note that you need to list the less specific "qcom,adreno" (since this

  is what the device is matched on), in addition to the more specific

  with the chip-id.

  If "amd,imageon" is used, there should be no top level msm device.

- reg: Physical base address and length of the controller's registers.

- interrupts: The interrupt signal from the gpu.

- clocks: device clocks

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ Required properties: 
Optional properties:

- clock-names: the following clocks are optional:

  * "lut_clk"

- qcom,lcdc-align-lsb: Boolean value indicating that LSB alignment should be

  used for LCDC. This is only valid for 18bpp panels.



Example:

drivers/gpu/drm/msm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
config DRM_MSM

	tristate "MSM DRM"

	depends on DRM

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	depends on ARCH_QCOM || SOC_IMX5 || (ARM && COMPILE_TEST)

	depends on OF && COMMON_CLK

	depends on MMU

	select QCOM_MDT_LOADER if ARCH_QCOM
@@ -11,7 +11,7 @@ config DRM_MSM 
	select DRM_PANEL

	select SHMEM

	select TMPFS

	select QCOM_SCM

	select QCOM_SCM if ARCH_QCOM

	select WANT_DEV_COREDUMP

	select SND_SOC_HDMI_CODEC if SND_SOC

	select SYNC_FILE

drivers/gpu/drm/msm/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi 
msm-y := \

	adreno/adreno_device.o \

	adreno/adreno_gpu.o \

	adreno/a2xx_gpu.o \

	adreno/a3xx_gpu.o \

	adreno/a4xx_gpu.o \

	adreno/a5xx_gpu.o \
@@ -14,6 +15,7 @@ msm-y := \ 
	adreno/a6xx_gpu.o \

	adreno/a6xx_gmu.o \

	adreno/a6xx_hfi.o \

	adreno/a6xx_gpu_state.o \

	hdmi/hdmi.o \

	hdmi/hdmi_audio.o \

	hdmi/hdmi_bridge.o \
@@ -68,11 +70,9 @@ msm-y := \ 
	disp/dpu1/dpu_hw_util.o \

	disp/dpu1/dpu_hw_vbif.o \

	disp/dpu1/dpu_io_util.o \

	disp/dpu1/dpu_irq.o \

	disp/dpu1/dpu_kms.o \

	disp/dpu1/dpu_mdss.o \

	disp/dpu1/dpu_plane.o \

	disp/dpu1/dpu_power_handle.o \

	disp/dpu1/dpu_rm.o \

	disp/dpu1/dpu_vbif.o \

	msm_atomic.o \
@@ -90,10 +90,11 @@ msm-y := \ 
	msm_perf.o \

	msm_rd.o \

	msm_ringbuffer.o \

	msm_submitqueue.o

	msm_submitqueue.o \

	msm_gpu_tracepoints.o \

	msm_gpummu.o



msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o \

			  disp/dpu1/dpu_dbg.o

msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o



msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE