diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2020-05-14 12:08:12 +0200 |
|---|---|---|
| committer |   Inki Dae <inki.dae@samsung.com> | 2020-05-18 11:37:26 +0900 |
| commit | fda022143f6f00fc4c3c296175b5e315c7c12710 (patch) | |
| tree | d9c3a369c63a785d93849900f00ebbc086090322 | |
| parent | drm/exynos: make pointer to const data const type (diff) | |
| download | linux-dev-fda022143f6f00fc4c3c296175b5e315c7c12710.tar.xz linux-dev-fda022143f6f00fc4c3c296175b5e315c7c12710.zip | |
drm/exynos: mixer: Fix enabling of the runtime power management
Runtime power management is essential for the Exynos Mixer driver
operation. It should be enabled before adding its DRM component, because
in some cases (when deferred probe takes place due to the IOMMU
availability) the DRM driver might be initialized directly from the
Mixer's component_add() call, what results in starting the driver
operation without enabling the runtime power management.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 21b726baedea..c7e2e2ebc327 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1244,9 +1244,11 @@ static int mixer_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); + pm_runtime_enable(dev); + ret = component_add(&pdev->dev, &mixer_component_ops); - if (!ret) - pm_runtime_enable(dev); + if (ret) + pm_runtime_disable(dev); return ret; } |