Commit 0173ecf2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2019-09-06' of https://gitlab.freedesktop.org/drm/msm into drm-next 



+ move msm8998 (snapdragon 835) display support
+ dpu fixes/cleanup
+ better async commit support for cursor updates
   (for dpu for now, I'll add mdp5 and possibly
   mdp4 once the movers deliver boxes full of my
   older hardware, so for v5.5)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGuKVayu9bCuVe1RhzS6N6sHTrv4SVAh=qyCrmubX24Xag@mail.gmail.com
parents 9a60b299 9f614197

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ config DRM_MSM 
	select SHMEM

	select TMPFS

	select QCOM_SCM if ARCH_QCOM

	select QCOM_COMMAND_DB if ARCH_QCOM

	select WANT_DEV_COREDUMP

	select SND_SOC_HDMI_CODEC if SND_SOC

	select SYNC_FILE

	select PM_OPP

	default y

	help

	  DRM/KMS driver for MSM/snapdragon.

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ msm-y := \ 
	disp/dpu1/dpu_rm.o \

	disp/dpu1/dpu_vbif.o \

	msm_atomic.o \

	msm_atomic_tracepoints.o \

	msm_debugfs.o \

	msm_drv.o \

	msm_fb.o \

drivers/gpu/drm/msm/adreno/a5xx_debugfs.c

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
/* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.

 */





#include <linux/types.h>

#include <linux/debugfs.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_file.h>

#include <drm/drm_print.h>



#include "a5xx_gpu.h"

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu) 


static int a6xx_gmu_clocks_probe(struct a6xx_gmu *gmu)

{

	int ret = msm_clk_bulk_get(gmu->dev, &gmu->clocks);

	int ret = devm_clk_bulk_get_all(gmu->dev, &gmu->clocks);



	if (ret < 1)

		return ret;

drivers/gpu/drm/msm/adreno/adreno_device.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ MODULE_FIRMWARE("qcom/a530_zap.b01"); 
MODULE_FIRMWARE("qcom/a530_zap.b02");

MODULE_FIRMWARE("qcom/a630_sqe.fw");

MODULE_FIRMWARE("qcom/a630_gmu.bin");

MODULE_FIRMWARE("qcom/a630_zap.mbn");



static inline bool _rev_match(uint8_t entry, uint8_t id)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE