From patchwork Mon Jan 11 21:41:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8011671 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F1F6BEEE5 for ; Mon, 11 Jan 2016 21:41:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43EEE201BB for ; Mon, 11 Jan 2016 21:41:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D7BBB201B9 for ; Mon, 11 Jan 2016 21:41:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A42557206B; Mon, 11 Jan 2016 13:41:44 -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 EA28A6E5A5 for ; Mon, 11 Jan 2016 13:41:32 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id u188so28131544wmu.0 for ; Mon, 11 Jan 2016 13:41:32 -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=p2nsN8vY8m9yRQZib6kEzZKSPbmsCTnCBBg79jvje+Q=; b=Y0A+MBBTVPq2xM+KlvorCTbnV1ifq1OKayY77a6I5sa69m1jRYr+/1CKjBUmsF50Zh HiBGoeR206hcaSxpd/jXzCJGRKkxfFiKlrswWyUsb8JyFOtzjHbfcA2ysvRYB26AlRq7 r85UB+J+H1SQrdbB0xtRlj19LAIzIJ9QO7Gok= 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=p2nsN8vY8m9yRQZib6kEzZKSPbmsCTnCBBg79jvje+Q=; b=XzwLdQmLKYNv9BPy1w5MG66YU4ZShEh3h4ORiL/qOE8xswBp4Aqc16BxQ17/++w0lz p6NUa9c9usKDQEM0FzopIXwo6dQQhbldWXisSTzOtunIBWmU+y2nI3rYduIVgWXkNOU4 1Dn4iAe28oj3I+XU86cZMiVhucp2oTRqdtBAZ0xZwafwVrx4n9v+cK2ZGcF2+5Cv8rOe WjBiTYhAjVfdmveKVdAH0OocINxIeOxlyO8affa6CIYPcsHFbUUcvNrcHPVU6395qHPt XBhNKh9ndz+uFgxA7EkR+vrWaRaYGYESOdeuMCubz5UuPzJc0y80jcNLVY4pZBvWCIXg KRwg== X-Gm-Message-State: ALoCoQm9IyO97FryZDQHCvNHwAgwR3XnwQ773iCrTJAX1g19sauxQTNbstYNILtH6mtMc/AoFKln7j4scfFt+7lV49ppLinAGQ== X-Received: by 10.28.184.136 with SMTP id i130mr15032065wmf.96.1452548491673; Mon, 11 Jan 2016 13:41:31 -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 c203sm14629237wmd.5.2016.01.11.13.41.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 13:41:31 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 11/22] drm/i915: Nuke intel_modeset_preclose Date: Mon, 11 Jan 2016 22:41:05 +0100 Message-Id: <1452548477-15905-12-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452548477-15905-1-git-send-email-daniel.vetter@ffwll.ch> References: <1452548477-15905-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , 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 Now that the drm core unlinks/disarms events there's no need to do so ourselves anymore. Nuke the code. Acked-by: Daniel Stone Reviewed-by: Alex Deucher Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/intel_display.c | 21 --------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 24 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a0f5659032fc..4bfa72e5a217 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1262,8 +1262,6 @@ void i915_driver_preclose(struct drm_device *dev, struct drm_file *file) i915_gem_context_close(dev, file); i915_gem_release(dev, file); mutex_unlock(&dev->struct_mutex); - - intel_modeset_preclose(dev, file); } void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 86fce41281fb..ec75e260f1eb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -16357,24 +16357,3 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m, err_printf(m, " VSYNC: %08x\n", error->transcoder[i].vsync); } } - -void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file) -{ - struct intel_crtc *crtc; - - for_each_intel_crtc(dev, crtc) { - struct intel_unpin_work *work; - - spin_lock_irq(&dev->event_lock); - - work = crtc->unpin_work; - - if (work && work->event && - work->event->base.file_priv == file) { - kfree(work->event); - work->event = NULL; - } - - spin_unlock_irq(&dev->event_lock); - } -} diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index e88050aee0c1..5e7422085162 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1235,7 +1235,6 @@ enum intel_display_power_domain intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder); void intel_mode_from_pipe_config(struct drm_display_mode *mode, struct intel_crtc_state *pipe_config); -void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file); int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state); int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);