forked from Minki/linux
drm/tilcdc: cleanup runtime PM handling
Cleanup runtime PM handling. Before the patch the usage of pm_runtime calls was inconsistent and hard to follow. After the update the pm_runtime calls are removed from set_scanout() and called around major operations that access the HW. After the patch the DPMS code does not have pm_runtime_forbid/allow calls any more and pm_runtime_irq_safe() is not set anymore. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> [Added description to the patch] Signed-off-by: Jyri Sarha <jsarha@ti.com>
This commit is contained in:
parent
29ddd6e171
commit
65734a2623
drivers/gpu/drm/tilcdc
@ -71,7 +71,6 @@ static void set_scanout(struct drm_crtc *crtc, int n)
|
||||
struct drm_device *dev = crtc->dev;
|
||||
struct tilcdc_drm_private *priv = dev->dev_private;
|
||||
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
tilcdc_write(dev, base_reg[n], tilcdc_crtc->start);
|
||||
tilcdc_write(dev, ceil_reg[n], tilcdc_crtc->end);
|
||||
if (tilcdc_crtc->scanout[n]) {
|
||||
@ -81,7 +80,6 @@ static void set_scanout(struct drm_crtc *crtc, int n)
|
||||
tilcdc_crtc->scanout[n] = crtc->primary->fb;
|
||||
drm_framebuffer_reference(tilcdc_crtc->scanout[n]);
|
||||
tilcdc_crtc->dirty &= ~stat[n];
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
}
|
||||
|
||||
static void update_scanout(struct drm_crtc *crtc)
|
||||
@ -186,8 +184,13 @@ static int tilcdc_crtc_page_flip(struct drm_crtc *crtc,
|
||||
|
||||
crtc->primary->fb = fb;
|
||||
tilcdc_crtc->event = event;
|
||||
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
|
||||
update_scanout(crtc);
|
||||
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -206,10 +209,8 @@ void tilcdc_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||
|
||||
tilcdc_crtc->dpms = mode;
|
||||
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
|
||||
if (mode == DRM_MODE_DPMS_ON) {
|
||||
pm_runtime_forbid(dev->dev);
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
start(crtc);
|
||||
} else {
|
||||
tilcdc_crtc->frame_done = false;
|
||||
@ -227,10 +228,9 @@ void tilcdc_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||
if (ret == 0)
|
||||
dev_err(dev->dev, "timeout waiting for framedone\n");
|
||||
}
|
||||
pm_runtime_allow(dev->dev);
|
||||
}
|
||||
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
}
|
||||
}
|
||||
|
||||
static bool tilcdc_crtc_mode_fixup(struct drm_crtc *crtc,
|
||||
@ -455,13 +455,16 @@ static int tilcdc_crtc_mode_set(struct drm_crtc *crtc,
|
||||
static int tilcdc_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
|
||||
struct drm_framebuffer *old_fb)
|
||||
{
|
||||
struct drm_device *dev = crtc->dev;
|
||||
int r;
|
||||
|
||||
r = tilcdc_verify_fb(crtc, crtc->primary->fb);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
update_scanout(crtc);
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -230,7 +230,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
|
||||
DBG("Maximum Pixel Clock Value %dKHz", priv->max_pixelclock);
|
||||
|
||||
pm_runtime_enable(dev->dev);
|
||||
pm_runtime_irq_safe(dev->dev);
|
||||
|
||||
/* Determine LCD IP Version */
|
||||
pm_runtime_get_sync(dev->dev);
|
||||
|
Loading…
Reference in New Issue
Block a user