Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2423074rdh; Sun, 29 Oct 2023 15:59:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdAWbUBZWPi/C0ThzBmC12Ib6/qEuyJf/DOlnYfQRD5wxOew2OwYOenfLsw3rBjBjcR3WC X-Received: by 2002:a05:6a00:1a45:b0:6be:4df:2c9c with SMTP id h5-20020a056a001a4500b006be04df2c9cmr11220887pfv.28.1698620369795; Sun, 29 Oct 2023 15:59:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698620369; cv=none; d=google.com; s=arc-20160816; b=oyHLE4xYD6GQcSu9SvYqTaPdW6IYYEwyDqwet3/5wy0Ua/RkGKm6mXOLoUIR4YLnzD DVjqgtnlEd6IvZ7b3fP3Wws2w3HBpq9gqm5kMUCJV8/5URRKD30Tue9inGQJl1y/gf+p q5mWuR5iqCj5QelJ3NurMe5Hj/sQqkJvlmPeiJgWFRDsd5kedQKljaw9AMfhdjbdk48e EnCsN9nIJP9XGVXA4qAWZpRwzvJrqr4g1s/7efiho9HPSi2e4qVWyOHXbkFFOGanYkUX UqC81IcgPhkgyeFHMnumsFLmtK2k9yqy1UPN+czqycmVRXKTHebKFVKHImFYz6HoAkRX WHwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F2oKyShBZDt10zdsIMxqRZd9jZzW9+cBFoKQYJUXoKU=; fh=IA+s95l3bdG5kktr2oBtymIkktKpAPt6VLvQ43E+of4=; b=tW5F3zEkLb3YeC/bdqwhNy/U0G32XUERwyiDDZulLZEw5qW1BJqwJaOLzd4LuQ16zM FVMOPhY1E2x+0C4UPXKdEBDun8QSMso8k81nHcs+neq38ZVsoFcYL9wH43LNnyzKzPoE tCq7iDsMbezGomiW0XrE0ovs3ozmTlTvXSXwQ0B6murbicFRrnEzz4tkn7SlvhOdsLqw xWjtJWaVD1qXSJA/sWCy0hR3a9MT27qI5h94cctTFywGfIsg0AdnOmb2apVONrIXif/l 8FFn/FCQNhM2dTHxvk8qYIgARjpGylHQULf17D+GGrxh4dE6LM2RfxStKJuC0QVZ2wiV SwSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eUSo1chg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id o5-20020a056a0015c500b006bd27e41c15si4159177pfu.291.2023.10.29.15.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:59:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eUSo1chg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 0A87D805CCCA; Sun, 29 Oct 2023 15:59:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231297AbjJ2W7J (ORCPT + 99 others); Sun, 29 Oct 2023 18:59:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231512AbjJ2W7B (ORCPT ); Sun, 29 Oct 2023 18:59:01 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEAEC30E0; Sun, 29 Oct 2023 15:56:16 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 235FFC433A9; Sun, 29 Oct 2023 22:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620173; bh=001YAmpLETxjsM9j7Vvl/WXpAl9mBPA1mEwrmF4EQAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eUSo1chgV/1QwDOuL4lMJw0aflRcbefarg4mIaCrhSmLID1NRw3ckUR8xzKXHR41J CAifWLXlcN0YsaPP/skQ6FwqSNlV7HAQDrX3CDEAofypDxO2/GtkSD/RU1CYJuvFMu N+1xaKhLM8SeZeuFHrm2s2QH1qE5VlpP2TN9lM8/Qq5Mqc8JwXv12ZfVlbbZ6TNNal bmM4KR1p8uCgYMDyQE2mn2esmTSfh2usIGWnpfvBgibLURFEtuh2miB0EbccacC16o tJg4te9cenjWUCzofVy78Apd5VbFo1DAeBwdN7SJO/C2oPYz7vKylCE3fheeZRLq9s v8K/SgMlXjW4Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luben Tuikov , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sasha Levin , alexander.deucher@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, James.Zhu@amd.com, lijo.lazar@amd.com, pierre-eric.pelloux-prayer@amd.com, zhenguo.yin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.5 38/52] drm/amdgpu: Unset context priority is now invalid Date: Sun, 29 Oct 2023 18:53:25 -0400 Message-ID: <20231029225441.789781-38-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225441.789781-1-sashal@kernel.org> References: <20231029225441.789781-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 29 Oct 2023 15:59:27 -0700 (PDT) From: Luben Tuikov [ Upstream commit eab0261967aeab528db4d0a51806df8209aec179 ] A context priority value of AMD_CTX_PRIORITY_UNSET is now invalid--instead of carrying it around and passing it to the Direct Rendering Manager--and it becomes AMD_CTX_PRIORITY_NORMAL in amdgpu_ctx_ioctl(), the gateway to context creation. Cc: Alex Deucher Cc: Christian König Signed-off-by: Luben Tuikov Acked-by: Alex Deucher Link: https://lore.kernel.org/r/20231017035656.8211-1-luben.tuikov@amd.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index 0dc9c655c4fbd..092962b93064f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -47,7 +47,6 @@ const unsigned int amdgpu_ctx_num_entities[AMDGPU_HW_IP_NUM] = { bool amdgpu_ctx_priority_is_valid(int32_t ctx_prio) { switch (ctx_prio) { - case AMDGPU_CTX_PRIORITY_UNSET: case AMDGPU_CTX_PRIORITY_VERY_LOW: case AMDGPU_CTX_PRIORITY_LOW: case AMDGPU_CTX_PRIORITY_NORMAL: @@ -55,6 +54,7 @@ bool amdgpu_ctx_priority_is_valid(int32_t ctx_prio) case AMDGPU_CTX_PRIORITY_VERY_HIGH: return true; default: + case AMDGPU_CTX_PRIORITY_UNSET: return false; } } -- 2.42.0