diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-07-28 17:51:02 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2015-08-16 10:23:33 +0900 |
| commit | 43a3b866a9e73e9bd215ec3f36c71e42469e70c6 (patch) | |
| tree | 59aca3628bf4c945d20cfd9ca47b568906851cc9 /drivers/gpu/drm/exynos | |
| parent | eb7a3fc74c58be9c01cdbe23947ae9eb032e8365 (diff) | |
| download | talos-op-linux-43a3b866a9e73e9bd215ec3f36c71e42469e70c6.tar.gz talos-op-linux-43a3b866a9e73e9bd215ec3f36c71e42469e70c6.zip | |
drm/exynos: clear channels only when iommu is enabled
This is simplest solution about reported problem[1]. It's no problem to
clear channel only when iommu is enabled, if we consider that we cannot
recognize iommu errors when iommu is disabled and it have been valid
until now. But this cannot be nice solution.
[1] https://lkml.org/lkml/2015/7/21/404
Reported-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 8d362b9365d3..337af025a594 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -956,7 +956,8 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) if (ctx->display) exynos_drm_create_enc_conn(drm_dev, ctx->display); - fimd_clear_channels(ctx->crtc); + if (is_drm_iommu_supported(drm_dev)) + fimd_clear_channels(ctx->crtc); ret = drm_iommu_attach_device(drm_dev, dev); if (ret) |
