Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/tegra: Stop cancelling page flip events

The core takes care of that now.

v2: Fixup misplaced hunk.

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Terje Bergström <tbergstrom@nvidia.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-12-git-send-email-daniel.vetter@ffwll.ch

-21
-17
drivers/gpu/drm/tegra/dc.c
··· 988 988 spin_unlock_irqrestore(&drm->event_lock, flags); 989 989 } 990 990 991 - void tegra_dc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file) 992 - { 993 - struct tegra_dc *dc = to_tegra_dc(crtc); 994 - struct drm_device *drm = crtc->dev; 995 - unsigned long flags; 996 - 997 - spin_lock_irqsave(&drm->event_lock, flags); 998 - 999 - if (dc->event && dc->event->base.file_priv == file) { 1000 - dc->event->base.destroy(&dc->event->base); 1001 - drm_crtc_vblank_put(crtc); 1002 - dc->event = NULL; 1003 - } 1004 - 1005 - spin_unlock_irqrestore(&drm->event_lock, flags); 1006 - } 1007 - 1008 991 static void tegra_dc_destroy(struct drm_crtc *crtc) 1009 992 { 1010 993 drm_crtc_cleanup(crtc);
-3
drivers/gpu/drm/tegra/drm.c
··· 860 860 struct tegra_drm_context *context, *tmp; 861 861 struct drm_crtc *crtc; 862 862 863 - list_for_each_entry(crtc, &drm->mode_config.crtc_list, head) 864 - tegra_dc_cancel_page_flip(crtc, file); 865 - 866 863 list_for_each_entry_safe(context, tmp, &fpriv->contexts, list) 867 864 tegra_drm_context_free(context); 868 865
-1
drivers/gpu/drm/tegra/drm.h
··· 195 195 u32 tegra_dc_get_vblank_counter(struct tegra_dc *dc); 196 196 void tegra_dc_enable_vblank(struct tegra_dc *dc); 197 197 void tegra_dc_disable_vblank(struct tegra_dc *dc); 198 - void tegra_dc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file); 199 198 void tegra_dc_commit(struct tegra_dc *dc); 200 199 int tegra_dc_state_setup_clock(struct tegra_dc *dc, 201 200 struct drm_crtc_state *crtc_state,