drm/msm: skip sde_dbg compilation altogether

Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com> Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
0ctobot · May 19, 2019 · 9f5295e · 9f5295e
1 parent 77244ba
commit 9f5295e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
@@ -33,8 +33,6 @@ msm_drm-y := \
 	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 \

diff --git a/drivers/gpu/drm/msm/sde/sde_hw_rot.c b/drivers/gpu/drm/msm/sde/sde_hw_rot.c
@@ -88,10 +88,6 @@ static int sde_hw_rot_start(struct sde_hw_rot *hw)
 
 	pdev = hw->caps->pdev;
 
-	rc = sde_dbg_reg_register_cb(hw->name, _sde_hw_rot_reg_dump, pdev);
-	if (rc)
-		SDE_ERROR("failed to register debug dump %d\n", rc);
-
 	hw->rot_ctx = sde_rotator_inline_open(pdev);
 	if (IS_ERR_OR_NULL(hw->rot_ctx)) {
 		rc = PTR_ERR(hw->rot_ctx);
@@ -116,9 +112,6 @@ static void sde_hw_rot_stop(struct sde_hw_rot *hw)
 
 	sde_rotator_inline_release(hw->rot_ctx);
 	hw->rot_ctx = NULL;
-
-	sde_dbg_reg_unregister_cb(hw->name, _sde_hw_rot_reg_dump,
-			hw->caps->pdev);
 }
 
 /**

diff --git a/drivers/gpu/drm/msm/sde/sde_hw_top.c b/drivers/gpu/drm/msm/sde/sde_hw_top.c
@@ -473,11 +473,6 @@ struct sde_hw_mdp *sde_hw_mdptop_init(enum sde_mdp idx,
 		goto blk_init_error;
 	}
 
-	sde_dbg_reg_register_dump_range(SDE_DBG_NAME, cfg->name,
-			mdp->hw.blk_off, mdp->hw.blk_off + mdp->hw.length,
-			mdp->hw.xin_id);
-	sde_dbg_set_sde_top_offset(mdp->hw.blk_off);
-
 	return mdp;
 
 blk_init_error:

diff --git a/drivers/gpu/drm/msm/sde_dbg.h b/drivers/gpu/drm/msm/sde_dbg.h
@@ -422,7 +422,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)
 {
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     }
-    void sde_dbg_set_sde_top_offset(u32 blk_off)
+    static inline void sde_dbg_set_sde_top_offset(u32 blk_off)
     {
     }
@@ Expand Down @@