brd: remove support for BLKFLSBUF

[linux.git] / drivers / gpu / host1x / debug.c

diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c
index ee3d12b51c50a036b89c48c3e60576a2a14acf5b..d9330fcc62ad5c88a6090e1c07eb0a8115019402 100644 (file)
--- a/drivers/gpu/host1x/debug.c
+++ b/drivers/gpu/host1x/debug.c
@@ -39,6 +39,7 @@ void host1x_debug_output(struct output *o, const char *fmt, ...)
        va_start(args, fmt);
        len = vsnprintf(o->buf, sizeof(o->buf), fmt, args);
        va_end(args);
        va_start(args, fmt);
        len = vsnprintf(o->buf, sizeof(o->buf), fmt, args);
        va_end(args);

+

        o->fn(o->ctx, o->buf, len);
 }
 
        o->fn(o->ctx, o->buf, len);
 }
 


@@ -48,13 +49,17 @@ static int show_channels(struct host1x_channel *ch, void *data, bool show_fifo)
        struct output *o = data;
 
        mutex_lock(&ch->reflock);
        struct output *o = data;
 
        mutex_lock(&ch->reflock);

+

        if (ch->refcount) {
                mutex_lock(&ch->cdma.lock);
        if (ch->refcount) {
                mutex_lock(&ch->cdma.lock);

+

                if (show_fifo)
                        host1x_hw_show_channel_fifo(m, ch, o);
                if (show_fifo)
                        host1x_hw_show_channel_fifo(m, ch, o);

+

                host1x_hw_show_channel_cdma(m, ch, o);
                mutex_unlock(&ch->cdma.lock);
        }
                host1x_hw_show_channel_cdma(m, ch, o);
                mutex_unlock(&ch->cdma.lock);
        }

+

        mutex_unlock(&ch->reflock);
 
        return 0;
        mutex_unlock(&ch->reflock);
 
        return 0;


@@ -62,22 +67,27 @@ static int show_channels(struct host1x_channel *ch, void *data, bool show_fifo)
 
 static void show_syncpts(struct host1x *m, struct output *o)
 {
 
 static void show_syncpts(struct host1x *m, struct output *o)
 {

-       int i;
+       unsigned int i;
+

        host1x_debug_output(o, "---- syncpts ----\n");
        host1x_debug_output(o, "---- syncpts ----\n");

+

        for (i = 0; i < host1x_syncpt_nb_pts(m); i++) {
                u32 max = host1x_syncpt_read_max(m->syncpt + i);
                u32 min = host1x_syncpt_load(m->syncpt + i);
        for (i = 0; i < host1x_syncpt_nb_pts(m); i++) {
                u32 max = host1x_syncpt_read_max(m->syncpt + i);
                u32 min = host1x_syncpt_load(m->syncpt + i);

+

                if (!min && !max)
                        continue;
                if (!min && !max)
                        continue;

-               host1x_debug_output(o, "id %d (%s) min %d max %d\n",
+
+               host1x_debug_output(o, "id %u (%s) min %d max %d\n",

                                    i, m->syncpt[i].name, min, max);
        }
 
        for (i = 0; i < host1x_syncpt_nb_bases(m); i++) {
                u32 base_val;
                                    i, m->syncpt[i].name, min, max);
        }
 
        for (i = 0; i < host1x_syncpt_nb_bases(m); i++) {
                u32 base_val;

+

                base_val = host1x_syncpt_load_wait_base(m->syncpt + i);
                if (base_val)
                base_val = host1x_syncpt_load_wait_base(m->syncpt + i);
                if (base_val)

-                       host1x_debug_output(o, "waitbase id %d val %d\n", i,
+                       host1x_debug_output(o, "waitbase id %u val %d\n", i,

                                            base_val);
        }
 
                                            base_val);
        }
 


@@ -114,7 +124,9 @@ static int host1x_debug_show_all(struct seq_file *s, void *unused)
                .fn = write_to_seqfile,
                .ctx = s
        };
                .fn = write_to_seqfile,
                .ctx = s
        };

+

        show_all(s->private, &o);
        show_all(s->private, &o);

+

        return 0;
 }
 
        return 0;
 }
 


@@ -124,7 +136,9 @@ static int host1x_debug_show(struct seq_file *s, void *unused)
                .fn = write_to_seqfile,
                .ctx = s
        };
                .fn = write_to_seqfile,
                .ctx = s
        };

+

        show_all_no_fifo(s->private, &o);
        show_all_no_fifo(s->private, &o);

+

        return 0;
 }
 
        return 0;
 }
 


@@ -134,10 +148,10 @@ static int host1x_debug_open_all(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations host1x_debug_all_fops = {
 }
 
 static const struct file_operations host1x_debug_all_fops = {

-       .open           = host1x_debug_open_all,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = host1x_debug_open_all,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,

 };
 
 static int host1x_debug_open(struct inode *inode, struct file *file)
 };
 
 static int host1x_debug_open(struct inode *inode, struct file *file)


@@ -146,10 +160,10 @@ static int host1x_debug_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations host1x_debug_fops = {
 }
 
 static const struct file_operations host1x_debug_fops = {

-       .open           = host1x_debug_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = host1x_debug_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,

 };
 
 static void host1x_debugfs_init(struct host1x *host1x)
 };
 
 static void host1x_debugfs_init(struct host1x *host1x)


@@ -201,6 +215,7 @@ void host1x_debug_dump(struct host1x *host1x)
        struct output o = {
                .fn = write_to_printk
        };
        struct output o = {
                .fn = write_to_printk
        };

+

        show_all(host1x, &o);
 }
 
        show_all(host1x, &o);
 }
 


@@ -209,5 +224,6 @@ void host1x_debug_dump_syncpts(struct host1x *host1x)
        struct output o = {
                .fn = write_to_printk
        };
        struct output o = {
                .fn = write_to_printk
        };

+

        show_syncpts(host1x, &o);
 }
        show_syncpts(host1x, &o);
 }