From patchwork Fri Jan 8 20:36:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7990301 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 2A3709FC69 for ; Fri, 8 Jan 2016 20:37:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C3D0201BC for ; Fri, 8 Jan 2016 20:37:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9920A201EF for ; Fri, 8 Jan 2016 20:37:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B5017A11A; Fri, 8 Jan 2016 12:37:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A27E7A10F for ; Fri, 8 Jan 2016 12:37:15 -0800 (PST) Received: by mail-wm0-f47.google.com with SMTP id f206so149767482wmf.0 for ; Fri, 08 Jan 2016 12:37:15 -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; bh=IuCcZG1vd6x2y40xWma5a9DZLSkGoX5z1iU7EIpuT+M=; b=fUvle8xbtDopaF9pcw7/qrYA8MHXfnVA8gTa6TJfqoPnnGbjbq2qHmrQNtIv11ML06 bzNZpiEkXAbkaI+eLzvE+3FWaa2facQQKjjCpBOpiS1weDjVkyfmPz3UomXIT8bqXnBr oOr8Zuuz5+MFldnEIQvIbNV0wwzMYliO7BKvs= 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; bh=IuCcZG1vd6x2y40xWma5a9DZLSkGoX5z1iU7EIpuT+M=; b=LRpj7OXuAN3tnGlvn0UNMuDECOXQKJVe2Zqmog/A1pvllrOaTrSJ/U9igzwcncSQf4 KszaPmn3+VHvoHJHRYhfDJJwmYW+Rptc5L/0bXtuEI3lDOgbH366AJsu89FGUuC6vJef iNkX/13zuG+HpSwpOWpOgrYuYGUqS+zTXIjBs1DtAwYXEAPUmBzJ5N7CxQuhPcV/hx1k G+tnUTgz1ejI/6c/UjKVrEae8bnG1LbPpvxXJrx2jasVetQTIeQZx8CjqMCjX3MUrusr 4a1w9nGPkDTE2QOI13389yKkexzUmjpe6azMGEpFzWZz0JneBs9Nr69nyp8/D6vpv9qV MmVA== X-Gm-Message-State: ALoCoQnMf/7mPf598QTJQJTxFLkKRgfnwzt+C+5+bwsyMbeQ/vMrc7SpXt0iTmfucFrp6vZsHtGsORkV4Ol2uJFijjoz54iUrQ== X-Received: by 10.28.45.10 with SMTP id t10mr889477wmt.12.1452285434039; Fri, 08 Jan 2016 12:37:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 12:37:13 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 17/21] drm/shmob: Nuke preclose hook Date: Fri, 8 Jan 2016 21:36:49 +0100 Message-Id: <1452285413-28459-18-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> Cc: Daniel Vetter , Intel Graphics Development , Laurent Pinchart , 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: , MIME-Version: 1.0 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 Again since the drm core takes care of event unlinking/disarming this is now just needless code. Cc: Laurent Pinchart Signed-off-by: Daniel Vetter --- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 20 -------------------- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 8 -------- 2 files changed, 28 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index b80802f55143..de7959a60774 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -438,26 +438,6 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .mode_set_base = shmob_drm_crtc_mode_set_base, }; -void shmob_drm_crtc_cancel_page_flip(struct shmob_drm_crtc *scrtc, - struct drm_file *file) -{ - struct drm_pending_vblank_event *event; - struct drm_device *dev = scrtc->crtc.dev; - unsigned long flags; - - /* Destroy the pending vertical blanking event associated with the - * pending page flip, if any, and disable vertical blanking interrupts. - */ - spin_lock_irqsave(&dev->event_lock, flags); - event = scrtc->event; - if (event && event->base.file_priv == file) { - scrtc->event = NULL; - event->base.destroy(&event->base); - drm_vblank_put(dev, 0); - } - spin_unlock_irqrestore(&dev->event_lock, flags); -} - void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) { struct drm_pending_vblank_event *event; diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 04e66e3751b4..7700ff172079 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -200,13 +200,6 @@ done: return ret; } -static void shmob_drm_preclose(struct drm_device *dev, struct drm_file *file) -{ - struct shmob_drm_device *sdev = dev->dev_private; - - shmob_drm_crtc_cancel_page_flip(&sdev->crtc, file); -} - static irqreturn_t shmob_drm_irq(int irq, void *arg) { struct drm_device *dev = arg; @@ -266,7 +259,6 @@ static struct drm_driver shmob_drm_driver = { | DRIVER_PRIME, .load = shmob_drm_load, .unload = shmob_drm_unload, - .preclose = shmob_drm_preclose, .set_busid = drm_platform_set_busid, .irq_handler = shmob_drm_irq, .get_vblank_counter = drm_vblank_no_hw_counter,