From patchwork Fri Jul 3 14:09:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 6715561 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 A32C09F457 for ; Fri, 3 Jul 2015 14:09:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE5E1207F9 for ; Fri, 3 Jul 2015 14:09:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E9CAA207F3 for ; Fri, 3 Jul 2015 14:09:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62F976ED7A; Fri, 3 Jul 2015 07:09:57 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D9FEA6E54F for ; Fri, 3 Jul 2015 07:09:55 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 03 Jul 2015 07:09:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,400,1432623600"; d="scan'208";a="757932174" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.56]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2015 07:09:38 -0700 Received: by rosetta (Postfix, from userid 1000) id 3823880093; Fri, 3 Jul 2015 17:09:39 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Fri, 3 Jul 2015 17:09:38 +0300 Message-Id: <1435932578-32209-8-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435932578-32209-1-git-send-email-mika.kuoppala@intel.com> References: <1435932578-32209-1-git-send-email-mika.kuoppala@intel.com> Cc: miku@iki.fi Subject: [Intel-gfx] [PATCH 7/7] drm/i915: Mark elsps submitted when they are pushed to hw 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.8 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 Now when we have requests this deep on call chain, we can mark the elsp being submitted when it actually is. While we are it, remove unnecessary temp assignment as it is already initialized as zero. Signed-off-by: Mika Kuoppala Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/intel_lrc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 67ff460..8bf4acb 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -304,14 +304,16 @@ static void execlists_elsp_write(struct drm_i915_gem_request *rq0, uint32_t desc[4]; /* XXX: You must always write both descriptors in the order below. */ - if (rq1) + if (rq1) { temp = execlists_ctx_descriptor(rq1); - else - temp = 0; + rq1->elsp_submitted++; + } + desc[1] = (u32)(temp >> 32); desc[0] = (u32)temp; temp = execlists_ctx_descriptor(rq0); + rq0->elsp_submitted++; desc[3] = (u32)(temp >> 32); desc[2] = (u32)temp; @@ -433,10 +435,6 @@ static void execlists_context_unqueue(struct intel_engine_cs *ring) WARN_ON(req1 && req1->elsp_submitted); execlists_submit_requests(req0, req1); - - req0->elsp_submitted++; - if (req1) - req1->elsp_submitted++; } static bool execlists_check_remove_request(struct intel_engine_cs *ring,