diff options
| author | Buddy Liong <a0270631@ti.com> | 2016-12-18 16:48:55 -0600 |
|---|---|---|
| committer | Buddy Liong <a0270631@ti.com> | 2017-02-07 16:06:39 -0600 |
| commit | c75e397d855916f32022c93b3db669cd51d0fee7 (patch) | |
| tree | 6c1310514c87dd8e3ed14ec2bfff8948dc96efe6 | |
| parent | dbf5993af66fffc6809a1f2a78b5cc58cbaaa048 (diff) | |
| download | jacinto6evm-c75e397d855916f32022c93b3db669cd51d0fee7.tar.gz | |
OMAPDSS: Adapt DSS driver for skipping initialization during bootup
Leverage the detection methods for display skip during init
and conditionally configure dss, dispc and overlay managers.
Since DSS clock configuration is required for overlay scaling
function to work correctly disabling only the pm runtime enable
logic should be enough.
This patch is ported from K3.14
http://review.omapzoom.org/36939
Change-Id: I9521d61ac73406acb60071b3193f12e531b8a555
Signed-off-by: Buddy Liong <a0270631@ti.com>
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dss.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index af04151c37ff..cbd236041005 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1221,11 +1221,13 @@ static int dss_bind(struct device *dev) if (r) goto err_init_ports; - pm_runtime_enable(&pdev->dev); + if (!omapdss_skipinit()) { + pm_runtime_enable(&pdev->dev); - r = dss_runtime_get(); - if (r) - goto err_runtime_get; + r = dss_runtime_get(); + if (r) + goto err_runtime_get; + } dss.dss_clk_rate = clk_get_rate(dss.dss_clk); |