[PATCH 07/14] drm/tidss: dispc: Switch REG_GET to using a mask

[Maxime Ripard]

The REG_GET function takes the start and end bits as parameter and will
generate a mask out of them.

This makes it difficult to share the masks between callers, since we now
need two arguments and to keep them consistent.

Let's change REG_GET to take the mask as an argument instead, and let
the caller create the mask. Eventually, this mask will be moved to a
define.

Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c 
b/drivers/gpu/drm/tidss/tidss_dispc.c
index 
e4729a5b79ed5d554e05c020adb7e2d3e7a8f4d3..cfd6c4cf716904cf78699baf2eb4c3a0f57a1abe
 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -612,13 +612,13 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32 
hw_videoport)
 static u32 FLD_MOD(u32 orig, u32 val, u32 mask)
 {
        return (orig & ~mask) | FIELD_PREP(mask, val);
 }
 
-static u32 REG_GET(struct dispc_device *dispc, u32 idx, u32 start, u32 end)
+static u32 REG_GET(struct dispc_device *dispc, u32 idx, u32 mask)
 {
-       return FIELD_GET(GENMASK(start, end), dispc_read(dispc, idx));
+       return FIELD_GET(mask, dispc_read(dispc, idx));
 }
 
 static void REG_FLD_MOD(struct dispc_device *dispc, u32 idx, u32 val,
                        u32 start, u32 end)
 {
@@ -2808,30 +2808,30 @@ int dispc_runtime_resume(struct dispc_device *dispc)
 {
        dev_dbg(dispc->dev, "resume\n");
 
        clk_prepare_enable(dispc->fclk);
 
-       if (REG_GET(dispc, DSS_SYSSTATUS, 0, 0) == 0)
+       if (REG_GET(dispc, DSS_SYSSTATUS, GENMASK(0, 0)) == 0)
                dev_warn(dispc->dev, "DSS FUNC RESET not done!\n");
 
        dev_dbg(dispc->dev, "OMAP DSS7 rev 0x%x\n",
                dispc_read(dispc, DSS_REVISION));
 
        dev_dbg(dispc->dev, "VP RESETDONE %d,%d,%d\n",
-               REG_GET(dispc, DSS_SYSSTATUS, 1, 1),
-               REG_GET(dispc, DSS_SYSSTATUS, 2, 2),
-               REG_GET(dispc, DSS_SYSSTATUS, 3, 3));
+               REG_GET(dispc, DSS_SYSSTATUS, GENMASK(1, 1)),
+               REG_GET(dispc, DSS_SYSSTATUS, GENMASK(2, 2)),
+               REG_GET(dispc, DSS_SYSSTATUS, GENMASK(3, 3)));
 
        if (dispc->feat->subrev == DISPC_AM625 ||
            dispc->feat->subrev == DISPC_AM65X)
                dev_dbg(dispc->dev, "OLDI RESETDONE %d,%d,%d\n",
-                       REG_GET(dispc, DSS_SYSSTATUS, 5, 5),
-                       REG_GET(dispc, DSS_SYSSTATUS, 6, 6),
-                       REG_GET(dispc, DSS_SYSSTATUS, 7, 7));
+                       REG_GET(dispc, DSS_SYSSTATUS, GENMASK(5, 5)),
+                       REG_GET(dispc, DSS_SYSSTATUS, GENMASK(6, 6)),
+                       REG_GET(dispc, DSS_SYSSTATUS, GENMASK(7, 7)));
 
        dev_dbg(dispc->dev, "DISPC IDLE %d\n",
-               REG_GET(dispc, DSS_SYSSTATUS, 9, 9));
+               REG_GET(dispc, DSS_SYSSTATUS, GENMASK(9, 9)));
 
        dispc_initial_config(dispc);
 
        dispc->is_enabled = true;
 

-- 
2.50.1