diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-06-12 20:34:28 +0900 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2015-06-20 00:32:58 +0900 |
| commit | c329f667ba3392c3270902335690f548a2778374 (patch) | |
| tree | 4cbf0e227b157c878fa1e72f04dc5e08eb9a9a60 /drivers/gpu/drm/exynos/exynos_drm_drv.h | |
| parent | ba4b77c4856a26b926d3892511568b9f4c6102e1 (diff) | |
| download | blackbird-obmc-linux-c329f667ba3392c3270902335690f548a2778374.tar.gz blackbird-obmc-linux-c329f667ba3392c3270902335690f548a2778374.zip | |
drm/exynos: remove chained calls to enable
With atomic modesetting all the control for CRTC, Planes, Encoders and
Connectors should come from DRM core, so the driver is not allowed to
enable or disable planes from inside the crtc_enable()/disable() call.
But it needs to disable planes with crtc_disable in exynos driver
internally. Because crtc is disabled before plane is disabled, it means
plane_disable just returns without any register changes, then we cannot
be sure setting register to disable plane when crtc is disable.
This patch removes this chainned calls to enable plane from exynos hw
drivers code letting only DRM core touch planes except to disable plane.
Also it leads eliminable enabled and resume of struct exynos_drm_plane.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_drv.h')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 6b4958bd4fc3..a3845693c634 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -64,8 +64,6 @@ enum exynos_drm_output_type { * @dma_addr: array of bus(accessed by dma) address to the memory region * allocated for a overlay. * @zpos: order of overlay layer(z position). - * @enabled: enabled or not. - * @resume: to resume or not. * * this structure is common to exynos SoC and its contents would be copied * to hardware specific overlay info. @@ -94,9 +92,6 @@ struct exynos_drm_plane { uint32_t pixel_format; dma_addr_t dma_addr[MAX_FB_BUFFER]; unsigned int zpos; - - bool enabled:1; - bool resume:1; }; /* |
