From patchwork Wed Jul 19 12:55:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9851981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86C8660392 for ; Wed, 19 Jul 2017 12:56:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78F7228650 for ; Wed, 19 Jul 2017 12:56:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B6452865F; Wed, 19 Jul 2017 12:56:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3649028650 for ; Wed, 19 Jul 2017 12:56:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F7196E553; Wed, 19 Jul 2017 12:55:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id E35426E52F for ; Wed, 19 Jul 2017 12:55:23 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p204so3524961wmg.1 for ; Wed, 19 Jul 2017 05:55:23 -0700 (PDT) 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-transfer-encoding; bh=TWZ5vz8ptOCIfQsz7qEUWOHtqs8jYSCpTQrv3hv5MI8=; b=i4P4ecb831ZZMM6AyGc/uXdYG/P/VuIAF1M0zgRVXPYeIKH1gqQZxJCfxhGCUpKkM/ uYnHiKQ6xjgHK6FLWuAmutbagKuG9jboHzdM3mgvISwsgSvgPqYzHc28kWFg9OleHTQs 6emKZg+gn68P5g9REGmSdKHQDVOSH3DUzx0aU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TWZ5vz8ptOCIfQsz7qEUWOHtqs8jYSCpTQrv3hv5MI8=; b=hfKN5GEmTiWtkiZ0brhNpDtFtJLpr9KJqn1RhemBEnMHeRVDjej6ziAaJYptbHFhvl FgbuZ1L6WSviOoi9+rsWB6f2r/tXSw3+1dTXmb9qb4WLoWZSn2SXZJWyAJPXk2pF/+Bo s2I+gE9uzFhWPwDFzvOsODNRXBKONQ/FBk316/kp4G9Z3bU1f8DjVIeyBHw8UUCZ0N0d fHf71TFGB2v6yOWmjwe7bKfiru/dHGaIj7gkLnUgHnqISFscRiOTc3hAyMw7hO9y5UK/ +eVcoJcxpRShSG9INe0z2SlwuSVmkvROg4ueJ46oaqY+Q1lyRtUsyNi1YtvgACZ5mvi/ Cd+w== X-Gm-Message-State: AIVw110sLjS/ZoYmPXBQYtsXjsDpp+uLW/W/NCYs9Mva71sWQ4Y5G1zA l0wS74VfKE45t13rMRU= X-Received: by 10.80.194.137 with SMTP id o9mr5730792edf.162.1500468922273; Wed, 19 Jul 2017 05:55:22 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id e46sm3069420edd.26.2017.07.19.05.55.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 05:55:21 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 9/9] drm/i915: Drop unpin stall in atomic_prepare_commit Date: Wed, 19 Jul 2017 14:55:02 +0200 Message-Id: <20170719125502.25696-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170719125502.25696-1-daniel.vetter@ffwll.ch> References: <20170719125502.25696-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development 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-Virus-Scanned: ClamAV using ClamSMTP The core already does this in setup_commit(). With this we can also remove the unpin_work_count since it's the last user. Cc: Maarten Lankhorst Cc: Ville Syrjälä Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 13 +------------ drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e52a2adbaaa5..351208b7b1ad 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11825,18 +11825,7 @@ static int intel_atomic_check(struct drm_device *dev, static int intel_atomic_prepare_commit(struct drm_device *dev, struct drm_atomic_state *state) { - struct drm_i915_private *dev_priv = to_i915(dev); - struct drm_crtc_state *crtc_state; - struct drm_crtc *crtc; - int i, ret; - - for_each_new_crtc_in_state(state, crtc, crtc_state, i) { - if (state->legacy_cursor_update) - continue; - - if (atomic_read(&to_intel_crtc(crtc)->unpin_work_count) >= 2) - flush_workqueue(dev_priv->wq); - } + int ret; ret = mutex_lock_interruptible(&dev->struct_mutex); if (ret) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 9cb7e781e863..96402c06e295 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -798,8 +798,6 @@ struct intel_crtc { unsigned long long enabled_power_domains; struct intel_overlay *overlay; - atomic_t unpin_work_count; - /* Display surface base address adjustement for pageflips. Note that on * gen4+ this only adjusts up to a tile, offsets within a tile are * handled in the hw itself (with the TILEOFF register). */