Merge "drm/msm/sde: add sde debug bus dump support" into msm-4.8 (98eb9afd) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_hw_catalog.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@
		#define SDE_HW_VER_171 SDE_HW_VER(1, 7, 1) /* 8996 v2.0 */
		#define SDE_HW_VER_172 SDE_HW_VER(1, 7, 2) /* 8996 v3.0 */
		#define SDE_HW_VER_300 SDE_HW_VER(3, 0, 0) /* 8998 v1.0 */
		#define SDE_HW_VER_301 SDE_HW_VER(3, 0, 1) /* 8998 v1.1 */
		#define SDE_HW_VER_400 SDE_HW_VER(4, 0, 0) /* sdm845 v1.0 */

		#define IS_SDM845_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)

+2 −0

Original line number	Diff line number	Diff line
		@@ -1168,6 +1168,8 @@ static int sde_kms_hw_init(struct msm_kms *kms)
		goto power_error;
		}

		sde_dbg_init_dbg_buses(sde_kms->core_rev);

		/* Initialize reg dma block which is a singleton */
		rc = sde_reg_dma_init(sde_kms->reg_dma, sde_kms->catalog,
		sde_kms->dev);

+2142 −12

File changed.

Preview size limit exceeded, changes collapsed.

+10 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,12 @@ bool sde_evtlog_is_enabled(struct sde_dbg_evtlog *evtlog, u32 flag);
		ssize_t sde_evtlog_dump_to_buffer(struct sde_dbg_evtlog *evtlog,
		char *evtlog_buf, ssize_t evtlog_buf_size);

		/**
		* sde_dbg_init_dbg_buses - initialize debug bus dumping support for the chipset
		* @hwversion: Chipset revision
		*/
		void sde_dbg_init_dbg_buses(u32 hwversion);

		/**
		* sde_dbg_init - initialize global sde debug facilities: evtlog, regdump
		* @debugfs_root: debugfs root in which to create sde debug entries
		@@ -265,6 +271,10 @@ static inline ssize_t sde_evtlog_dump_to_buffer(struct sde_dbg_evtlog *evtlog,
		return 0;
		}

		void sde_dbg_init_dbg_buses(u32 hwversion)
		{
		}

		static inline int sde_dbg_init(struct dentry debugfs_root, struct device dev,
		struct sde_dbg_power_ctrl *power_ctrl)
		{