From patchwork Fri Mar 5 17:05:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12118897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 333E9C433E6 for ; Fri, 5 Mar 2021 17:05:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFBB76507C for ; Fri, 5 Mar 2021 17:05:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFBB76507C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 095896EC07; Fri, 5 Mar 2021 17:05:55 +0000 (UTC) Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id D49666E221 for ; Fri, 5 Mar 2021 17:05:53 +0000 (UTC) Received: by mail-pg1-x52f.google.com with SMTP id p21so1796723pgl.12 for ; Fri, 05 Mar 2021 09:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U1BseBekJ+tOeXt4taA9dL1obFHh1tg8YMeZxhPeNnE=; b=gi5SATDCCw9C0UWQXp8BZolqGR8Cejk+F9c/yekmDIcWrAqP/bCtfX/100GkpJNj1G CL03Cm+cZm9qKHzOhhMUxPMm/ghH7VyyrIjoLrFrtu6EoFO2d6/K5KlR3gbukvMTbXtH f1q+qBz/BBvbFqH5MwgngvpQ3rWsl5sfbgNNN4XhjsDqQOY8tEMrM6rbdzITQzyvlkTG Fz5AKoe+e6/zDEZNk7jtrGjuXd2OjqQD9SNTAFIdSDCesAKMwkMJErDbC4FDNLhlemqj LMTXrFgfj1Be4ZzsbV+zKNqwbxPPd3y66w8YOBOqWFGDjB8q8wK49TgcPbVsUdf2Ndlk H2NQ== 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:mime-version :content-transfer-encoding; bh=U1BseBekJ+tOeXt4taA9dL1obFHh1tg8YMeZxhPeNnE=; b=lcmys0XpTLOfbRkQrVobnKCNoipBZknfbEP8tP71VfBXj/DJ7bcPGG0TdeXBxANSjf E5npuis79z2q1H5vR5Dw5f0dBfPrLqw/R8xgdQhbYxu4B1mPz0e07TssCxsENQyjh9VO yY9RCVBda4kIakHiFVVxex9jNeiRnPPrNvhgBYKTDck5msRLSux22u+S8528V1vzTFg2 qtDH4Y844wI4imvyZodxzC9YqP7e5nsiZ8d0KvBSs5LdjSC/PpqQyN6/SZEyfqOqNqGQ y+fRNanHa7E8m3QKa4osC0E+wQvPyfi6gTZs/o4//UfFTe5sD0ylIAapaO0XghvLvweD ZNlA== X-Gm-Message-State: AOAM530ESGX4eQPVG3hJg0O2J9Zf6QJKvHrAswdFt9MRL8IQm1bt9UkJ 5RUTlgoehuszYz8v/7gNH219iW8kM+Q5QQ== X-Google-Smtp-Source: ABdhPJzCfw0PzF8b0qT06MTcyu3wF+GtyOwRwmiq9oU/D5te35pU95NuvYeRiASw/CACVBLIWvzujg== X-Received: by 2002:a63:205c:: with SMTP id r28mr9895175pgm.183.1614963952908; Fri, 05 Mar 2021 09:05:52 -0800 (PST) Received: from omlet.lan (jfdmzpr04-ext.jf.intel.com. [134.134.137.73]) by smtp.gmail.com with ESMTPSA id k64sm3257681pga.52.2021.03.05.09.05.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:05:52 -0800 (PST) From: Jason Ekstrand X-Google-Original-From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH] Revert "drm/i915: Propagate errors on awaiting already signaled fences" Date: Fri, 5 Mar 2021 11:05:46 -0600 Message-Id: <20210305170546.56472-1-jason.ekstrand@intel.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Ekstrand , Marcin Slusarz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 9e31c1fe45d555a948ff66f1f0e3fe1f83ca63f7. Ever since that commit, we've been having issues where a hang in one client can propagate to another. In particular, a hang in an app can propagate to the X server which causes the whole desktop to lock up. Signed-off-by: Jason Ekstrand Reported-by: Marcin Slusarz Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3080 Fixes: 9e31c1fe45d5 ("drm/i915: Propagate errors on awaiting already signaled fences") --- drivers/gpu/drm/i915/i915_request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index e7b4c4bc41a64..870d6083bb57e 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -1232,10 +1232,8 @@ i915_request_await_execution(struct i915_request *rq, do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } if (fence->context == rq->fence.context) continue; @@ -1333,10 +1331,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } /* * Requests on the same timeline are explicitly ordered, along