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_vidi.c | |
| parent | Merge branch 'vmwgfx-fixes-3.18' of git://people.freedesktop.org/~thomash/linux (diff) | |
| parent | drm/exynos: correct connector->dpms field before resuming (diff) | |
| download | linux-dev-66338feee458cb2b04e8f2b515b8d660e49ba29a.tar.xz linux-dev-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_vidi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index d565207040a2..50faf913e574 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -630,7 +630,6 @@ static int vidi_remove(struct platform_device *pdev) { struct exynos_drm_manager *mgr = platform_get_drvdata(pdev); struct vidi_context *ctx = mgr->ctx; - struct drm_encoder *encoder = ctx->encoder; if (ctx->raw_edid != (struct edid *)fake_edid_info) { kfree(ctx->raw_edid); @@ -639,9 +638,6 @@ static int vidi_remove(struct platform_device *pdev) return -EINVAL; } - encoder->funcs->destroy(encoder); - drm_connector_cleanup(&ctx->connector); - return 0; } |