Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp813239pxb; Tue, 12 Apr 2022 14:09:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoJA7IPtc9bJ/ICrlvA1apxWgsDxymTZHEg1FRCyNqv9+993/MGAzh7RI63XSL67bEdNn0 X-Received: by 2002:a17:90b:1886:b0:1cb:8e79:8ebb with SMTP id mn6-20020a17090b188600b001cb8e798ebbmr7035849pjb.176.1649797792344; Tue, 12 Apr 2022 14:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649797792; cv=none; d=google.com; s=arc-20160816; b=qcrw6Nv0grA94z65d/4C6+9yjlNNK7Wld3ceFH+uZ2tGgh9+vt2HFUz6YAUzMp6Hr3 73VTWZJaQgckHS+qel6TUIljKoQhIU2vzRrP1cKjqoekrMZsQBbpraGPJTvWVVFFPWHu Qsecp5Uu16IB1rMD0QnMXcqHgNGlpnGwKVNx90qLfCX83jmVzG9PrmB2/+4B90SJ1oCY qGGMOfIdWl3M11wS3p87JzAYY5wg0OpNPqiwQrXyujeM7gyIaRIutSj026Z+YxixSHYj seyBZti2Y0ntHmYPuYdeiFEA4NSbm+TX9uwOIodnzd+Y7BIMBs4l99TJMnVUaRJ+Ge0W sOfg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XZhEF5DT+pZEVM10sLUz1mWcu7Qmuxvwq7b0zwbbf4o=; b=UOBP+l/33ewWdqQyURokPs4LwiUNko7mSdoIz9aNl1b9ZEUKk8J98aNcbrLZC447ry 2csCEY8ORlQhi79gNaNHEDfXdl+9aKfGVwMeYLWhBAhuK0jXmoQebhKpSzRdIrh8iC0F 0wsPTQ96JufJ9kIQywhsBuH1BEP3Fl5WPjuFLwN9M2KGIP+5D9WBL/XbsOAm1igV6NPw CcrTQfrY3q8ZkSTsHFsoySOjA6SIOPXl57kIcAwidrLasIWp9/2wbT6AVySZuT9cJWJQ GM6P+97Ts7Tjh0H5UPzIqsezMqXIK/pNwREiyAXLF+upDj2F4SqflwGXSX2Pb18mm7Vh ba9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0yHXB6LO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id b14-20020a63d30e000000b0039dadd21a30si590404pgg.512.2022.04.12.14.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:09:52 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0yHXB6LO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6B54CE099A; Tue, 12 Apr 2022 13:26:31 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355035AbiDLIGw (ORCPT + 99 others); Tue, 12 Apr 2022 04:06:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354069AbiDLH0C (ORCPT ); Tue, 12 Apr 2022 03:26:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB1E618349; Tue, 12 Apr 2022 00:05:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6787760B2B; Tue, 12 Apr 2022 07:05:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 723C3C385A1; Tue, 12 Apr 2022 07:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747130; bh=98APagSa0U42erfRQUeR32abN7Mgn6/L5uXCLR4wu94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0yHXB6LO0xMH56XZgP+slhTJVqixzSRNEmzsDsLOfYoCasG/ibJ/7Bo46+jkwW3n3 tthA1DnPhtyrMetPLlR2zTDOtcm9I+Q3ge1z7PFgfXP6rm8QXsrD6SN0MfcqgNOa9y QOX7GDXU0BLp9aLC1jWsWQye7jFll8Ms4abFQxkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emily Deng , James Zhu , Alex Deucher Subject: [PATCH 5.16 255/285] drm/amdgpu/vcn: Fix the register setting for vcn1 Date: Tue, 12 Apr 2022 08:31:52 +0200 Message-Id: <20220412062951.020268143@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emily Deng commit 02fc996d5098f4c3f65bdf6cdb6b28e3f29ba789 upstream. Correct the code error for setting register UVD_GFX10_ADDR_CONFIG. Need to use inst_idx, or it only will set VCN0. Signed-off-by: Emily Deng Reviewed-by: James Zhu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -569,8 +569,8 @@ static void vcn_v3_0_mc_resume_dpg_mode( AMDGPU_GPU_PAGE_ALIGN(sizeof(struct amdgpu_fw_shared)), 0, indirect); /* VCN global tiling registers */ - WREG32_SOC15_DPG_MODE(0, SOC15_DPG_MODE_OFFSET( - UVD, 0, mmUVD_GFX10_ADDR_CONFIG), adev->gfx.config.gb_addr_config, 0, indirect); + WREG32_SOC15_DPG_MODE(inst_idx, SOC15_DPG_MODE_OFFSET( + UVD, inst_idx, mmUVD_GFX10_ADDR_CONFIG), adev->gfx.config.gb_addr_config, 0, indirect); } static void vcn_v3_0_disable_static_power_gating(struct amdgpu_device *adev, int inst)