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

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

Merge tag 'drm-msm-fixes-2019-01-24' of git://people.freedesktop.org/~robclark/linux into drm-fixes 



A few fixes for v5.0.. the opp-level fix and removal of hard-coded irq
name is partially to make things smoother in v5.1 merge window to
avoid dependency on drm vs dt trees, but are otherwise sane changes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGsAEHd2tGRQxRTs+A-8y_tthPs2iUgCCCEwR5vDMXab4A@mail.gmail.com
parents 7325e4bd a840f690

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ Example: 
		reg = <0x04300000 0x20000>;

		reg = <0x04300000 0x20000>;

		reg-names = "kgsl_3d0_reg_memory";

		reg-names = "kgsl_3d0_reg_memory";

		interrupts = <GIC_SPI 80 0>;

		interrupts = <GIC_SPI 80 0>;

		interrupt-names = "kgsl_3d0_irq";

		clock-names =

		clock-names =

		    "core",

		    "core",

		    "iface",

		    "iface",

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -944,7 +944,7 @@ static u32 a6xx_gmu_get_arc_level(struct device *dev, unsigned long freq) 
	np = dev_pm_opp_get_of_node(opp);

	np = dev_pm_opp_get_of_node(opp);





	if (np) {

	if (np) {

		of_property_read_u32(np, "qcom,level", &val);

		of_property_read_u32(np, "opp-level", &val);

		of_node_put(np);

		of_node_put(np);

	}

	}

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -765,7 +765,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	adreno_gpu->rev = config->rev;

	adreno_gpu->rev = config->rev;





	adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";

	adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";

	adreno_gpu_config.irqname = "kgsl_3d0_irq";





	adreno_gpu_config.va_start = SZ_16M;

	adreno_gpu_config.va_start = SZ_16M;

	adreno_gpu_config.va_end = 0xffffffff;

	adreno_gpu_config.va_end = 0xffffffff;

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -365,19 +365,6 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane, 
			&pdpu->pipe_qos_cfg);

			&pdpu->pipe_qos_cfg);

}

}





static void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);



	if (!pdpu->is_rt_pipe)

		return;



	pm_runtime_get_sync(&dpu_kms->pdev->dev);

	_dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL);

	pm_runtime_put_sync(&dpu_kms->pdev->dev);

}



/**

/**

 * _dpu_plane_set_ot_limit - set OT limit for the given plane

 * _dpu_plane_set_ot_limit - set OT limit for the given plane

 * @plane:		Pointer to drm plane

 * @plane:		Pointer to drm plane
@@ -1248,6 +1235,19 @@ static void dpu_plane_reset(struct drm_plane *plane) 
}

}





#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

static void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);



	if (!pdpu->is_rt_pipe)

		return;



	pm_runtime_get_sync(&dpu_kms->pdev->dev);

	_dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL);

	pm_runtime_put_sync(&dpu_kms->pdev->dev);

}



static ssize_t _dpu_plane_danger_read(struct file *file,

static ssize_t _dpu_plane_danger_read(struct file *file,

			char __user *buff, size_t count, loff_t *ppos)

			char __user *buff, size_t count, loff_t *ppos)

{

{

drivers/gpu/drm/msm/msm_drv.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -250,7 +250,8 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, 
void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,

void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma);

		struct msm_gem_vma *vma);

int msm_gem_map_vma(struct msm_gem_address_space *aspace,

int msm_gem_map_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma, struct sg_table *sgt, int npages);

		struct msm_gem_vma *vma, int prot,

		struct sg_table *sgt, int npages);

void msm_gem_close_vma(struct msm_gem_address_space *aspace,

void msm_gem_close_vma(struct msm_gem_address_space *aspace,

		struct msm_gem_vma *vma);

		struct msm_gem_vma *vma);
@@ -333,6 +334,7 @@ void msm_gem_kernel_put(struct drm_gem_object *bo, 
struct drm_gem_object *msm_gem_import(struct drm_device *dev,

struct drm_gem_object *msm_gem_import(struct drm_device *dev,

		struct dma_buf *dmabuf, struct sg_table *sgt);

		struct dma_buf *dmabuf, struct sg_table *sgt);





__printf(2, 3)

void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...);

void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...);





int msm_framebuffer_prepare(struct drm_framebuffer *fb,

int msm_framebuffer_prepare(struct drm_framebuffer *fb,
@@ -396,12 +398,14 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m); 
int msm_debugfs_late_init(struct drm_device *dev);

int msm_debugfs_late_init(struct drm_device *dev);

int msm_rd_debugfs_init(struct drm_minor *minor);

int msm_rd_debugfs_init(struct drm_minor *minor);

void msm_rd_debugfs_cleanup(struct msm_drm_private *priv);

void msm_rd_debugfs_cleanup(struct msm_drm_private *priv);

__printf(3, 4)

void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,

void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,

		const char *fmt, ...);

		const char *fmt, ...);

int msm_perf_debugfs_init(struct drm_minor *minor);

int msm_perf_debugfs_init(struct drm_minor *minor);

void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);

void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);

#else

#else

static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }

static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }

__printf(3, 4)

static inline void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,

static inline void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,

		const char *fmt, ...) {}

		const char *fmt, ...) {}

static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}

static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}