Merge "disp: msm: sde: update check flags to handle CONFIG_DEBUG_FS" (413c1ebd) · Commits · e / devices / android_kernel_fairphone_FP4

msm/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,6 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \
		sde/sde_connector.o \
		sde/sde_color_processing.o \
		sde/sde_vbif.o \
		sde_dbg.o \
		sde_dbg_evtlog.o \
		sde_io_util.o \
		sde/sde_hw_reg_dma_v1_color_proc.o \
		sde/sde_hw_color_proc_v4.o \
		@@ -71,6 +69,9 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \
		sde/sde_fence.o \
		sde/sde_hw_qdss.o \

		msm_drm-$(CONFIG_DEBUG_FS) += sde_dbg.o \
		sde_dbg_evtlog.o \

		msm_drm-$(CONFIG_DRM_SDE_WB) += sde/sde_wb.o \
		sde/sde_encoder_phys_wb.o \

msm/msm_drv.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -805,16 +805,7 @@ static int msm_drm_init(struct device dev, struct drm_driver drv)
		priv->fbdev = msm_fbdev_init(ddev);
		#endif

		priv->debug_root = debugfs_create_dir("debug",
		ddev->primary->debugfs_root);
		if (IS_ERR_OR_NULL(priv->debug_root)) {
		pr_err("debugfs_root create_dir fail, error %ld\n",
		PTR_ERR(priv->debug_root));
		priv->debug_root = NULL;
		goto fail;
		}

		ret = sde_dbg_debugfs_register(priv->debug_root);
		ret = sde_dbg_debugfs_register(dev);
		if (ret) {
		dev_err(dev, "failed to reg sde dbg debugfs: %d\n", ret);
		goto fail;

msm/sde/sde_crtc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ static void _sde_crtc_deinit_events(struct sde_crtc *sde_crtc)
		return;
		}

		#ifdef CONFIG_DEBUG_FS
		static int _sde_debugfs_fps_status_show(struct seq_file s, void data)
		{
		struct sde_crtc *sde_crtc;
		@@ -211,6 +212,7 @@ static int _sde_debugfs_fps_status(struct inode inode, struct file file)
		return single_open(file, _sde_debugfs_fps_status_show,
		inode->i_private);
		}
		#endif

		static ssize_t fps_periodicity_ms_store(struct device *device,
		struct device_attribute attr, const char buf, size_t count)

msm/sde_dbg.c

+25 −2

Original line number	Diff line number	Diff line
		@@ -4522,14 +4522,37 @@ static const struct file_operations sde_reg_fops = {
		#endif
		};

		int sde_dbg_debugfs_register(struct dentry *debugfs_root)
		int sde_dbg_debugfs_register(struct device *dev)
		{
		static struct sde_dbg_base *dbg = &sde_dbg_base;
		struct sde_dbg_reg_base *blk_base;
		char debug_name[80] = "";
		struct dentry *debugfs_root = NULL;
		struct platform_device *pdev = to_platform_device(dev);
		struct drm_device *ddev = platform_get_drvdata(pdev);
		struct msm_drm_private *priv = NULL;

		if (!debugfs_root)
		if (!ddev) {
		pr_err("Invalid drm device node\n");
		return -EINVAL;
		}

		priv = ddev->dev_private;
		if (!priv) {
		pr_err("Invalid msm drm private node\n");
		return -EINVAL;
		}

		debugfs_root = debugfs_create_dir("debug",
		ddev->primary->debugfs_root);
		if (IS_ERR_OR_NULL(debugfs_root)) {
		pr_err("debugfs_root create_dir fail, error %ld\n",
		PTR_ERR(debugfs_root));
		priv->debug_root = NULL;
		return -EINVAL;
		}

		priv->debug_root = debugfs_root;

		debugfs_create_file("dbg_ctrl", 0600, debugfs_root, NULL,
		&sde_dbg_ctrl_fops);

msm/sde_dbg.h

+7 −8

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef SDE_DBG_H_
		@@ -250,7 +250,7 @@ int sde_dbg_init(struct device *dev);
		* @debugfs_root: debugfs root in which to create sde debug entries
		* Returns: 0 or -ERROR
		*/
		int sde_dbg_debugfs_register(struct dentry *debugfs_root);
		int sde_dbg_debugfs_register(struct device *dev);

		/**
		* sde_dbg_destroy - destroy the global sde debug facilities
		@@ -407,13 +407,12 @@ static inline void sde_dbg_init_dbg_buses(u32 hwversion)
		{
		}

		static inline int sde_dbg_init(struct device *dev,
		struct sde_dbg_power_ctrl *power_ctrl)
		static inline int sde_dbg_init(struct device *dev)
		{
		return 0;
		}

		static inline int sde_dbg_debugfs_register(struct dentry *debugfs_root)
		static inline int sde_dbg_debugfs_register(struct device *dev)
		{
		return 0;
		}
		@@ -422,7 +421,7 @@ static inline void sde_dbg_destroy(void)
		{
		}

		static inline void sde_dbg_dump(enum sde_dbg_dump_context,
		static inline void sde_dbg_dump(enum sde_dbg_dump_context mode,
		const char *name, ...)
		{
		}
		@@ -443,7 +442,7 @@ static inline void sde_dbg_reg_register_dump_range(const char *base_name,
		{
		}

		void sde_dbg_set_sde_top_offset(u32 blk_off)
		static inline void sde_dbg_set_sde_top_offset(u32 blk_off)
		{
		}

		@@ -462,7 +461,7 @@ static inline void sde_rsc_debug_dump(u32 mux_sel)
		{
		}

		static inline void dsi_ctrl_debug_dump(u32 entries, u32 size)
		static inline void dsi_ctrl_debug_dump(u32 *entries, u32 size)
		{
		}