summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubhash Jadavani <subhashj@codeaurora.org>2015-04-28 18:54:43 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:41:02 -0700
commitbc3319bf2800cd9ee79216d32dd1e7209be35d5e (patch)
treedf9378f671a266ef94d5875b701fd0583a0231b2
parentec3e1e02fc89869144d2da987cfe01977f92f38b (diff)
msm: mdss: fix compilation errors if debugfs is disabled
This change fixes the compilation errors seen when DEBUG_FS is disabled. Change-Id: I28fb230c65b90a9c2ec33c5e4332164e37f2f241 Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_debug.c108
1 files changed, 54 insertions, 54 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_debug.c b/drivers/video/fbdev/msm/mdss_mdp_debug.c
index a07b0e3bea4c..678970b6ce80 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_debug.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_debug.c
@@ -124,41 +124,6 @@ static void __dump_mixer(struct seq_file *s, struct mdss_mdp_mixer *mixer)
seq_printf(s, "\nTotal pipes=%d\n", cnt);
}
-static void __dump_buf_data(struct seq_file *s, struct msm_fb_data_type *mfd)
-{
- struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
- struct mdss_mdp_data *buf;
- int i = 0;
-
- seq_printf(s, "List of buffers for fb%d\n", mfd->index);
-
- mutex_lock(&mdp5_data->list_lock);
- if (!list_empty(&mdp5_data->bufs_used)) {
- seq_puts(s, " Buffers used:\n");
- list_for_each_entry(buf, &mdp5_data->bufs_used, buf_list)
- __print_buf(s, buf, true);
- }
-
- if (!list_empty(&mdp5_data->bufs_freelist)) {
- seq_puts(s, " Buffers in free list:\n");
- list_for_each_entry(buf, &mdp5_data->bufs_freelist, buf_list)
- __print_buf(s, buf, true);
- }
-
- if (!list_empty(&mdp5_data->bufs_pool)) {
- seq_printf(s, " Last %d buffers used:\n", BUF_DUMP_LAST_N);
-
- list_for_each_entry_reverse(buf, &mdp5_data->bufs_pool,
- buf_list) {
- if (buf->last_freed == 0 || i == BUF_DUMP_LAST_N)
- break;
- __print_buf(s, buf, true);
- i++;
- }
- }
- mutex_unlock(&mdp5_data->list_lock);
-}
-
static void __dump_timings(struct seq_file *s, struct mdss_mdp_ctl *ctl)
{
struct mdss_panel_info *pinfo;
@@ -247,25 +212,6 @@ static int __dump_mdp(struct seq_file *s, struct mdss_data_type *mdata)
return 0;
}
-static int __dump_buffers(struct seq_file *s, struct mdss_data_type *mdata)
-{
- struct mdss_mdp_ctl *ctl;
- int i, ignore_ndx = -1;
-
- for (i = 0; i < mdata->nctl; i++) {
- ctl = mdata->ctl_off + i;
- /* ignore slave ctl in split display case */
- if (ctl->num == ignore_ndx)
- continue;
- if (ctl->mixer_right && (ctl->mixer_right->ctl != ctl))
- ignore_ndx = ctl->mixer_right->ctl->num;
-
- if (ctl->mfd)
- __dump_buf_data(s, ctl->mfd);
- }
- return 0;
-}
-
#define DUMP_CHUNK 256
#define DUMP_SIZE SZ_32K
void mdss_mdp_dump(struct mdss_data_type *mdata)
@@ -299,6 +245,60 @@ void mdss_mdp_dump(struct mdss_data_type *mdata)
}
#ifdef CONFIG_DEBUG_FS
+static void __dump_buf_data(struct seq_file *s, struct msm_fb_data_type *mfd)
+{
+ struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
+ struct mdss_mdp_data *buf;
+ int i = 0;
+
+ seq_printf(s, "List of buffers for fb%d\n", mfd->index);
+
+ mutex_lock(&mdp5_data->list_lock);
+ if (!list_empty(&mdp5_data->bufs_used)) {
+ seq_puts(s, " Buffers used:\n");
+ list_for_each_entry(buf, &mdp5_data->bufs_used, buf_list)
+ __print_buf(s, buf, true);
+ }
+
+ if (!list_empty(&mdp5_data->bufs_freelist)) {
+ seq_puts(s, " Buffers in free list:\n");
+ list_for_each_entry(buf, &mdp5_data->bufs_freelist, buf_list)
+ __print_buf(s, buf, true);
+ }
+
+ if (!list_empty(&mdp5_data->bufs_pool)) {
+ seq_printf(s, " Last %d buffers used:\n", BUF_DUMP_LAST_N);
+
+ list_for_each_entry_reverse(buf, &mdp5_data->bufs_pool,
+ buf_list) {
+ if (buf->last_freed == 0 || i == BUF_DUMP_LAST_N)
+ break;
+ __print_buf(s, buf, true);
+ i++;
+ }
+ }
+ mutex_unlock(&mdp5_data->list_lock);
+}
+
+static int __dump_buffers(struct seq_file *s, struct mdss_data_type *mdata)
+{
+ struct mdss_mdp_ctl *ctl;
+ int i, ignore_ndx = -1;
+
+ for (i = 0; i < mdata->nctl; i++) {
+ ctl = mdata->ctl_off + i;
+ /* ignore slave ctl in split display case */
+ if (ctl->num == ignore_ndx)
+ continue;
+ if (ctl->mixer_right && (ctl->mixer_right->ctl != ctl))
+ ignore_ndx = ctl->mixer_right->ctl->num;
+
+ if (ctl->mfd)
+ __dump_buf_data(s, ctl->mfd);
+ }
+ return 0;
+}
+
static int mdss_debugfs_dump_show(struct seq_file *s, void *v)
{
struct mdss_data_type *mdata = (struct mdss_data_type *)s->private;