From patchwork Fri Jan 8 20:36:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7990171 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 267DCBEEE5 for ; Fri, 8 Jan 2016 20:37:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42C02201F2 for ; Fri, 8 Jan 2016 20:37:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 520A9200F4 for ; Fri, 8 Jan 2016 20:37:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7C3C7A0EA; Fri, 8 Jan 2016 12:37:10 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6B397A099 for ; Fri, 8 Jan 2016 12:37:08 -0800 (PST) Received: by mail-wm0-f46.google.com with SMTP id l65so148391078wmf.1 for ; Fri, 08 Jan 2016 12:37:08 -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=1LJ6pT9NfGRJupAb0f/oY+EHQIXM7BHSI3b2NdZ3GGk=; b=bOtdmmK3Kfs82u2rz3y3CQlSwUA0g4UxabTqTpt038J0aROZgGCNwHKp/6wXUBipQc ryY00VthX8ZMiiQMeV65YmT+HQC+PmfIbIizEfB7gOt4J3vd/3F9DNqRKX9tLapVHi9X ppHJJx8wIonunJxbAek8Mk8BxsRXlOcm9zsAA= 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=1LJ6pT9NfGRJupAb0f/oY+EHQIXM7BHSI3b2NdZ3GGk=; b=IuMN8WcKLNMzsK92eqesV8Rqn+ED0JLJl9msuUDLLGAdJ8/2mbVggG+wfI9FWUwbnG Ic8r87nMOj8OJMQgzBGQwY3ZyOjR4FFZnS6Ow7QHrBz3BsEHbs1qaaU9Ia5/Mi4m+qJR Oz3i4aeenOznVV2HmTf7n2jrVLTaRihUNrqBqkOhgXSnR363/AaTY6RtqO5ENlXT2NRF Q+zAv9vxDYGfY+N1QzK7LiOfOwnmjuU4+RvQJxaZ8m02H6xyvATa5JXwauUwWzoCd4Li ILaoi8vhVkbZ1sb9ByJiBGD+5Jvxn0mwL6X68qgtF9nRoZQeUprDYey/a7shSdlXHNUG G4dg== X-Gm-Message-State: ALoCoQm+Xr4Rq9e54oajYhBqhTT6K2dpErUZEAySKqF9vDPwV3f13bR+/Iu3GNvtwDUtd3pqdjOpR8FIYw3mJLlmXGIOGOcDvA== X-Received: by 10.28.89.69 with SMTP id n66mr804120wmb.63.1452285427495; Fri, 08 Jan 2016 12:37:07 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 12:37:06 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/21] drm/i915: Nuke intel_modeset_preclose Date: Fri, 8 Jan 2016 21:36:42 +0100 Message-Id: <1452285413-28459-11-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 , 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. 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 b0928b1413e2..aa7e9c04a923 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -16355,24 +16355,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);