drm/komeda: Correct d71 register block counting

Per HW, d71->num_blocks includes reserved blocks but no PERIPH block,
correct the block counting accordingly.
D71 happens to only have one reserved block and periph block, which
hides this counting error.

Signed-off-by: james qian wang (Arm Technology China) <james.qian.wang@arm.com>
Reviewed-by: Mihail Atanassov <mihail.atanassov@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210061015.25905-1-james.qian.wang@arm.com

diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
index 822b23a1ce75a826a4c3d58a69175faea039a922..d53f95dea0a1dcc5bff20169a93ef5fb4892ce77 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
@@ -414,8 +414,11 @@ static int d71_enum_resources(struct komeda_dev *mdev)
                d71->pipes[i] = to_d71_pipeline(pipe);
        }
 
-       /* loop the register blks and probe */
-       i = 2; /* exclude GCU and PERIPH */
+       /* loop the register blks and probe.
+        * NOTE: d71->num_blocks includes reserved blocks.
+        * d71->num_blocks = GCU + valid blocks + reserved blocks
+        */
+       i = 1; /* exclude GCU */
        offset = D71_BLOCK_SIZE; /* skip GCU */
        while (i < d71->num_blocks) {
                blk_base = mdev->reg_base + (offset >> 2);
@@ -425,9 +428,9 @@ static int d71_enum_resources(struct komeda_dev *mdev)
                        err = d71_probe_block(d71, &blk, blk_base);
                        if (err)
                                goto err_cleanup;
-                       i++;
                }
 
+               i++;
                offset += D71_BLOCK_SIZE;
        }