drm: atmel_hlcdc: replace regmap_read with regmap_read_poll_timeout

Replace regmap_read with regmap_read_poll_timeout to neatly handle
retries

Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Acked-by: Dharma Balasubiramani <dharma.b@microchip.com>
Reviewed-by: Hari Prasath Gujulan Elango <hari.prasathge@microchip.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240424053351.589830-4-manikandan.m@microchip.com

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index cc5cf4c..b229692 100644 (file)
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -203,19 +203,22 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,
        pm_runtime_get_sync(dev->dev);
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_DISP);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              (status & ATMEL_HLCDC_DISP))
-               cpu_relax();
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    !(status & ATMEL_HLCDC_DISP),
+                                   10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register DISPSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_SYNC);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              (status & ATMEL_HLCDC_SYNC))
-               cpu_relax();
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    !(status & ATMEL_HLCDC_SYNC),
+                                   10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register LCDSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_PIXEL_CLK);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              (status & ATMEL_HLCDC_PIXEL_CLK))
-               cpu_relax();
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    !(status & ATMEL_HLCDC_PIXEL_CLK),
+                                   10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register CLKSTS timeout\n");
 
        clk_disable_unprepare(crtc->dc->hlcdc->sys_clk);
        pinctrl_pm_select_sleep_state(dev->dev);
@@ -241,20 +244,23 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c,
        clk_prepare_enable(crtc->dc->hlcdc->sys_clk);
 
        regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_PIXEL_CLK);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              !(status & ATMEL_HLCDC_PIXEL_CLK))
-               cpu_relax();
-
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    status & ATMEL_HLCDC_PIXEL_CLK,
+                                    10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register CLKSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_SYNC);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              !(status & ATMEL_HLCDC_SYNC))
-               cpu_relax();
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    status & ATMEL_HLCDC_SYNC,
+                                    10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register LCDSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_DISP);
-       while (!regmap_read(regmap, ATMEL_HLCDC_SR, &status) &&
-              !(status & ATMEL_HLCDC_DISP))
-               cpu_relax();
+       if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
+                                    status & ATMEL_HLCDC_DISP,
+                                    10, 1000))
+               dev_warn(dev->dev, "Atmel LCDC status register DISPSTS timeout\n");
+
 
        pm_runtime_put_sync(dev->dev);