diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2017-03-15 15:41:04 +0100 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2017-06-01 16:21:34 +0900 |
| commit | f44d3d2f84d6bc6b685f40a18e08b4bdcaf3d1ef (patch) | |
| tree | 310ebfb7c8dfcd5c0d9daa5915e7d459ba24ab34 /drivers/gpu/drm/exynos/exynos_drm_fimd.c | |
| parent | d644951c2b2b013751e7dd5efe886340e196fab4 (diff) | |
| download | linux-f44d3d2f84d6bc6b685f40a18e08b4bdcaf3d1ef.tar.bz2 | |
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_drm_fimd.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 93bdfbb51275..fc4ff9bdca4a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -982,13 +982,12 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) { struct fimd_context *ctx = dev_get_drvdata(dev); struct drm_device *drm_dev = data; - struct exynos_drm_private *priv = drm_dev->dev_private; struct exynos_drm_plane *exynos_plane; unsigned int i; int ret; ctx->drm_dev = drm_dev; - ctx->pipe = priv->pipe++; + ctx->pipe = drm_dev->mode_config.num_crtc; for (i = 0; i < WINDOWS_NR; i++) { ctx->configs[i].pixel_formats = fimd_formats; @@ -1018,11 +1017,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) if (is_drm_iommu_supported(drm_dev)) fimd_clear_channels(ctx->crtc); - ret = drm_iommu_attach_device(drm_dev, dev); - if (ret) - priv->pipe--; - - return ret; + return drm_iommu_attach_device(drm_dev, dev); } static void fimd_unbind(struct device *dev, struct device *master, |