diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-03 05:23:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-03 05:23:17 +1000 |
| commit | 66338feee458cb2b04e8f2b515b8d660e49ba29a (patch) | |
| tree | a9ddcf0dda4ad423429277bd5a6c39e697cabf86 /drivers/gpu/drm/exynos/exynos_drm_dsi.c | |
| parent | 10a8fce846c1b12ebb29b036d1a15efc65eddbb5 (diff) | |
| parent | 74cfe07a838d137ee6f425e00a03642f588fb76b (diff) | |
| download | linux-66338feee458cb2b04e8f2b515b8d660e49ba29a.tar.gz linux-66338feee458cb2b04e8f2b515b8d660e49ba29a.tar.bz2 linux-66338feee458cb2b04e8f2b515b8d660e49ba29a.zip | |
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
This pull-request includes some bug fixes and code cleanups.
Especially, this fixes the bind failure issue occurred when it tries
to re-bind Exynos drm driver after unbound, and the modetest failure
issue incurred by not having a pair to vblank on and off requests.
* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
drm/exynos: correct connector->dpms field before resuming
drm/exynos: enable vblank after DPMS on
drm/exynos: init kms poll at the end of initialization
drm/exynos: propagate plane initialization errors
drm/exynos: vidi: fix build warning
drm/exynos: remove explicit encoder/connector de-initialization
drm/exynos: init vblank with real number of crtcs
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 24741d8758e8..acf7e9e39dcd 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1660,13 +1660,9 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master, void *data) { struct exynos_dsi *dsi = exynos_dsi_display.ctx; - struct drm_encoder *encoder = dsi->encoder; exynos_dsi_dpms(&exynos_dsi_display, DRM_MODE_DPMS_OFF); - exynos_dsi_connector_destroy(&dsi->connector); - encoder->funcs->destroy(encoder); - mipi_dsi_host_unregister(&dsi->dsi_host); } |