From patchwork Fri Jan 8 20:36:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7990391 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D3D0F9F1CC for ; Fri, 8 Jan 2016 20:37:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E066F201F5 for ; Fri, 8 Jan 2016 20:37:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 13101201BC for ; Fri, 8 Jan 2016 20:37:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 912EC7A125; Fri, 8 Jan 2016 12:37:20 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B06A7A115 for ; Fri, 8 Jan 2016 12:37:16 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id l65so17503125wmf.3 for ; Fri, 08 Jan 2016 12:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=dNP1y+0dr/xDanmkgCQAlIcmJiX1ra/s/aX4qQt1EsM=; b=QWb3F2KPwc64JoQO0uZiQBI21i7PGCSE68iZof3MlAjOS/u2lKB8qK3sLZchZoNjPe Bd72YPZ63iwDGLy56UDDgdUGT7WGRBEQjJ6jDVpujUdXkO6gqmeZZ6ACFbXiwxwynCvA V/clGlfqvaKJE0Dxfwhn6bebezV0kImC0dQT8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=dNP1y+0dr/xDanmkgCQAlIcmJiX1ra/s/aX4qQt1EsM=; b=OsRUaurcAjkzcchTjj7vKePU/hgjOdT0wEe244eAOg0WrooMZFyr2YlFMlkAPEWmD7 cob5/Tiu12JjygqI2g1IjWpe04bjejjwwRlO7Fs/MrX76XIqgCC7q85kPGYAXaMbuTLr sFy5qzSV8txtnTh0komPzsU+REwouXMnDBPFx0YLJ3drDGELlg7OHMJqDwKwoFc0qQqG KtCGWZzoWLt4VgWDR10FBrauxwHMkWc4wJurTpLT4lykjGez0dbnp4mhiFbeLNJ39tiY FY64bI3mHGrq578O62tlhtPMrj3qNsHYdCvxkyOAoP9pbc7X3axF84W/SWoq3V/Ucb/T CQUQ== X-Gm-Message-State: ALoCoQkAhyVXVR7PZjjJL7sDtx8jNGI25RDlXu49Hl6Xtn/AamLU8bZUimcYZJkH+sqH6ofHp0KIS7f47/uo4Wo00rN96L8z/w== X-Received: by 10.194.119.232 with SMTP id kx8mr138202267wjb.94.1452285435106; Fri, 08 Jan 2016 12:37:15 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id w194sm5679732wmd.0.2016.01.08.12.37.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 12:37:14 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 18/21] drm/tegra: Stop cancelling page flip events Date: Fri, 8 Jan 2016 21:36:50 +0100 Message-Id: <1452285413-28459-19-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452285413-28459-1-git-send-email-daniel.vetter@ffwll.ch> References: <1452285413-28459-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Terje=20Bergstr=C3=B6m?= , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The core takes care of that now. Cc: Thierry Reding Cc: Terje Bergström Signed-off-by: Daniel Vetter --- drivers/gpu/drm/tegra/dc.c | 17 ----------------- drivers/gpu/drm/tegra/drm.c | 3 --- 2 files changed, 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index dde6f208c347..fb2b4b0271a2 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -988,23 +988,6 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc) spin_unlock_irqrestore(&drm->event_lock, flags); } -void tegra_dc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file) -{ - struct tegra_dc *dc = to_tegra_dc(crtc); - struct drm_device *drm = crtc->dev; - unsigned long flags; - - spin_lock_irqsave(&drm->event_lock, flags); - - if (dc->event && dc->event->base.file_priv == file) { - dc->event->base.destroy(&dc->event->base); - drm_crtc_vblank_put(crtc); - dc->event = NULL; - } - - spin_unlock_irqrestore(&drm->event_lock, flags); -} - static void tegra_dc_destroy(struct drm_crtc *crtc) { drm_crtc_cleanup(crtc); diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index c5c856a0879d..021d0e1398fb 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -860,9 +860,6 @@ static void tegra_drm_preclose(struct drm_device *drm, struct drm_file *file) struct tegra_drm_context *context, *tmp; struct drm_crtc *crtc; - list_for_each_entry(crtc, &drm->mode_config.crtc_list, head) - tegra_dc_cancel_page_flip(crtc, file); - list_for_each_entry_safe(context, tmp, &fpriv->contexts, list) tegra_drm_context_free(context);