From mboxrd@z Thu Jan 1 00:00:00 1970 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 B19F2C433F5 for ; Thu, 9 Dec 2021 18:53:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA62810E248; Thu, 9 Dec 2021 18:53:56 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3919010E248; Thu, 9 Dec 2021 18:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639076035; x=1670612035; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1pHYBJ1RHb5dlPsfg3d2uuOeN6KsRGg2eJS0OU7Twpc=; b=T3gD/Ps3AHRqrkTDfNYtAMg/tjDO0gMPQGCWHJEHYGVgJcBK7ClYABEg 3X4uyRBfE3ygn6IbbR5Cz5X1yw2E9DZ9lFUnctLP6FflR9KNtJeyX6ITW UXQ53pkshTJb77gly1PPaij1rh6fheRhmgRzKgAdt2c+avhOfbgd+jvKK 9grel0a8o1i7LTtk7ky6Tnqz9DfhzgpH1MRzryQxAAad7DUe5XiDXYELV TAsR3U44k6st5zJt3coE6QygAk9sGe9EVNSTpaeyI2GnPX3iyM24IUsfD 1wEYA0makKu4x4wWze8nV96iVXMm+rwZvtUuqoQl/+WFwAg1tuT5mnq9d w==; X-IronPort-AV: E=McAfee;i="6200,9189,10193"; a="298972831" X-IronPort-AV: E=Sophos;i="5.88,193,1635231600"; d="scan'208";a="298972831" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 10:53:42 -0800 X-IronPort-AV: E=Sophos;i="5.88,193,1635231600"; d="scan'208";a="612629419" Received: from jons-linux-dev-box.fm.intel.com ([10.1.27.20]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 10:53:41 -0800 From: Matthew Brost To: , Date: Thu, 9 Dec 2021 10:48:14 -0800 Message-Id: <20211209184814.21125-1-matthew.brost@intel.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH] drm/i915/guc: Use correct context lock when callig clr_context_registered X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" s/ce/cn/ when grabbing guc_state.lock before calling clr_context_registered. Fixes: 0f7976506de61 ("drm/i915/guc: Rework and simplify locking") Signed-off-by: Matthew Brost Cc: --- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 1f9d4fde421f..9b7b4f4e0d91 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1937,9 +1937,9 @@ static int steal_guc_id(struct intel_guc *guc, struct intel_context *ce) list_del_init(&cn->guc_id.link); ce->guc_id = cn->guc_id; - spin_lock(&ce->guc_state.lock); + spin_lock(&cn->guc_state.lock); clr_context_registered(cn); - spin_unlock(&ce->guc_state.lock); + spin_unlock(&cn->guc_state.lock); set_context_guc_id_invalid(cn); -- 2.33.1