From: Joonyoung Shim Date: Tue, 28 Jul 2015 08:51:02 +0000 (+0900) Subject: drm/exynos: clear channels only when iommu is enabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=43a3b866a9e73e9bd215ec3f36c71e42469e70c6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Joonyoung Shim Signed-off-by: Inki Dae --- 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)