From patchwork Wed Nov 2 19:21:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 13028921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8948BC4332F for ; Wed, 2 Nov 2022 19:19:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9C1B10E589; Wed, 2 Nov 2022 19:19:27 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 913C410E589; Wed, 2 Nov 2022 19:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667416763; x=1698952763; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5fnK83yg6jKl6KjHVJPI1b46Zx2u4MyBAuqCJkbI1hc=; b=fLgscHxgmIEKJMz33P6DQkt0eplm2XLpiqXDJ0/scrtqv7jE+XADmaq7 YRo5VgrCV42o5JUmg81xyTeTOAAFPU88v3tOcIPGG6tT45z5fCBCxOxG/ 5FnCQ9iKUfWOGBfe2mFRwqxiE1islIsVYOFcqdp6DOqy9os7GMt+1xhHf wPYVkWX2qlWZ/u6GmCoQ6IAI1Rj6gROrGZ+7utXBmDkEjrjt+exDZ+xsO DuV8LkX3Tfz5OSZfhIisPJa+aQtPBTUaIUbnyogBJMCYkvMD8e0dI0266 ZGFIkokHm1nLg4ea3LtqlJ8gJTGHcwev8sCJMi/8ljVjJir3otlNCu0jP A==; X-IronPort-AV: E=McAfee;i="6500,9779,10519"; a="289213508" X-IronPort-AV: E=Sophos;i="5.95,234,1661842800"; d="scan'208";a="289213508" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2022 12:19:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10519"; a="777017562" X-IronPort-AV: E=Sophos;i="5.95,234,1661842800"; d="scan'208";a="777017562" Received: from relo-linux-5.jf.intel.com ([10.165.21.154]) by fmsmga001.fm.intel.com with ESMTP; 02 Nov 2022 12:19:22 -0700 From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Subject: [PATCH v2 0/2] Fix for two GuC issues Date: Wed, 2 Nov 2022 12:21:07 -0700 Message-Id: <20221102192109.2492625-1-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ 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: John Harrison , DRI-Devel@Lists.FreeDesktop.Org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: John Harrison Fix for a deadlock issue between the GuC busyness stats worker and GT resets. Also fix kernel contexts not getting the correct scheduling priority at start of day. v2: Rename existing uses of _trylock rather than adding a _noretry version. Also improve the comment a bit. Signed-off-by: John Harrison John Harrison (2): drm/i915/guc: Properly initialise kernel contexts drm/i915/guc: Don't deadlock busyness stats vs reset drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gt/intel_reset.c | 18 ++++++++++++++++-- drivers/gpu/drm/i915/gt/intel_reset.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-)