From patchwork Tue Mar 8 01:05:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 8528111 Return-Path: X-Original-To: patchwork-intel-gfx@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 C8D339F38C for ; Tue, 8 Mar 2016 01:08:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F285C2015A for ; Tue, 8 Mar 2016 01:08:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 09875200E9 for ; Tue, 8 Mar 2016 01:08:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ADC5889057; Tue, 8 Mar 2016 01:08:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B6956E0E8 for ; Tue, 8 Mar 2016 01:07:25 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 07 Mar 2016 17:07:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,554,1449561600"; d="scan'208";a="61734527" Received: from mdroper-hswdev.fm.intel.com (HELO mdroper-hswdev) ([10.1.134.197]) by fmsmga004.fm.intel.com with ESMTP; 07 Mar 2016 17:07:26 -0800 Received: from mattrope by mdroper-hswdev with local (Exim 4.84) (envelope-from ) id 1ad67R-0001De-2n; Mon, 07 Mar 2016 17:07:25 -0800 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Mon, 7 Mar 2016 17:05:43 -0800 Message-Id: <1457399146-4578-6-git-send-email-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1457399146-4578-1-git-send-email-matthew.d.roper@intel.com> References: <1457399146-4578-1-git-send-email-matthew.d.roper@intel.com> Cc: shobhit.kumar@intel.com Subject: [Intel-gfx] [PATCH 5/8] drm/i915/gen9: Hold wm_mutex around SKL watermark updates X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 SKL watermark code uses a field in dev_priv to hold the watermark results being calculated. If independent commits are submitted against disjoint CRTC's, the watermark updates could race and clobber each other's usage of dev_priv->wm.skl_results. Signed-off-by: Matt Roper --- drivers/gpu/drm/i915/intel_pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 041db5d3..29d37d3 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3805,6 +3805,7 @@ static void skl_update_wm(struct drm_crtc *crtc) struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); struct skl_pipe_wm *pipe_wm = &cstate->wm.optimal.skl; + mutex_lock(&dev_priv->wm.wm_mutex); /* Clear all dirty flags */ memset(results->dirty, 0, sizeof(bool) * I915_MAX_PIPES); @@ -3815,7 +3816,7 @@ static void skl_update_wm(struct drm_crtc *crtc) skl_set_plane_pixel_rate(crtc); if (!skl_update_pipe_wm(crtc, &results->ddb, pipe_wm)) - return; + goto out; skl_compute_wm_results(dev, pipe_wm, results, intel_crtc); results->dirty[intel_crtc->pipe] = true; @@ -3826,6 +3827,9 @@ static void skl_update_wm(struct drm_crtc *crtc) /* store the new configuration */ dev_priv->wm.skl_hw = *results; + +out: + mutex_unlock(&dev_priv->wm.wm_mutex); } static void ilk_compute_wm_config(struct drm_device *dev,