diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2017-03-15 17:41:04 +0300 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2017-06-01 10:21:34 +0300 |
| commit | f44d3d2f84d6bc6b685f40a18e08b4bdcaf3d1ef (patch) | |
| tree | 310ebfb7c8dfcd5c0d9daa5915e7d459ba24ab34 /drivers/gpu/drm/exynos/exynos_mixer.c | |
| parent | d644951c2b2b013751e7dd5efe886340e196fab4 (diff) | |
| download | linux-f44d3d2f84d6bc6b685f40a18e08b4bdcaf3d1ef.tar.xz | |
drm/exynos: kill exynos_drm_private::pipe
The field duplicates drm_dev->mode_config.num_crtc.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 3fb8cf3f1a43..1474982e94a9 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -900,7 +900,7 @@ static int mixer_initialize(struct mixer_context *mixer_ctx, priv = drm_dev->dev_private; mixer_ctx->drm_dev = drm_dev; - mixer_ctx->pipe = priv->pipe++; + mixer_ctx->pipe = drm_dev->mode_config.num_crtc; /* acquire resources: regs, irqs, clocks */ ret = mixer_resources_init(mixer_ctx); @@ -918,11 +918,7 @@ static int mixer_initialize(struct mixer_context *mixer_ctx, } } - ret = drm_iommu_attach_device(drm_dev, mixer_ctx->dev); - if (ret) - priv->pipe--; - - return ret; + return drm_iommu_attach_device(drm_dev, mixer_ctx->dev); } static void mixer_ctx_remove(struct mixer_context *mixer_ctx) |