diff options
author | Dave Airlie <airlied@redhat.com> | 2017-03-28 17:34:19 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-03-28 17:34:19 +1000 |
commit | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (patch) | |
tree | 0da1c9aaf772fac30fe68590a4ca1c3dd439cebd /drivers/gpu/drm/exynos/exynos_drm_vidi.c | |
parent | 65d1086c44791112188f6aebbdc3a27cab3736d3 (diff) | |
parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) |
Backmerge tag 'v4.11-rc4' into drm-next
Linux 4.11-rc4
The i915 GVT team need the rc4 code to base some more code on.
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_vidi.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 6bbb0ea8a6af..ef86dbf1cc29 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -170,6 +170,7 @@ static const struct exynos_drm_crtc_ops vidi_crtc_ops = { .enable_vblank = vidi_enable_vblank, .disable_vblank = vidi_disable_vblank, .update_plane = vidi_update_plane, + .atomic_flush = exynos_crtc_handle_event, }; static void vidi_fake_vblank_timer(unsigned long arg) |