drm: vc4: Remove incorrect limit from hvs_dlist debugfs function

The debugfs function to dump dlists aborted at 256 bytes,
when actually the dlist memory is generally significantly
larger but varies based on SoC.

We already have the correct limit in __vc4_hvs_alloc, so
store it for use in the debugfs dlist function.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 62af6aa..31de9de 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -327,6 +327,7 @@ struct vc4_hvs {
        struct platform_device *pdev;
        void __iomem *regs;
        u32 __iomem *dlist;
+       unsigned int dlist_mem_size;
 
        struct clk *core_clk;
 

diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index bbb4bcd..113d3c9 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -110,6 +110,7 @@ static int vc4_hvs_debugfs_dlist(struct seq_file *m, void *data)
        struct vc4_dev *vc4 = to_vc4_dev(dev);
        struct vc4_hvs *hvs = vc4->hvs;
        struct drm_printer p = drm_seq_file_printer(m);
+       unsigned int dlist_mem_size = hvs->dlist_mem_size;
        unsigned int next_entry_start;
        unsigned int i, j;
        u32 dlist_word, dispstat;
@@ -126,7 +127,7 @@ static int vc4_hvs_debugfs_dlist(struct seq_file *m, void *data)
                drm_printf(&p, "HVS chan %u:\n", i);
                next_entry_start = 0;
 
-               for (j = HVS_READ(SCALER_DISPLISTX(i)); j < 256; j++) {
+               for (j = HVS_READ(SCALER_DISPLISTX(i)); j < dlist_mem_size; j++) {
                        dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
                        drm_printf(&p, "dlist: %02d: 0x%08x\n", j,
                                   dlist_word);
@@ -1268,6 +1269,8 @@ struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4,
                    HVS_BOOTLOADER_DLIST_END,
                    (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
 
+       hvs->dlist_mem_size = dlist_size;
+
        /* Set up the HVS LBM memory manager.  We could have some more
         * complicated data structure that allowed reuse of LBM areas
         * between planes when they don't overlap on the screen, but