From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1CB9FBEA for ; Mon, 15 May 2023 17:09:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04B47C433D2; Mon, 15 May 2023 17:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1684170560; bh=NHei2NybN9r+q927sZxt70uyRTOZvmNHiajD31oWn0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jFM6CEW0DiYQ0ItD/IUD2qHV20NQrghoUrSdVwXO/60qlQ6WnT/Q0/mfTlxiGTIPu OTIu3gtMJ45lGd8JSGuiNVsHx6ZaKMH+4c2wZGdJkklVTGCAOuhiTuMuAQXdhOhJg9 Z+ufDwxg7dh6M6ElS9USSH8mJbbRC149MZdTg40s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Saleemkhan Jamadar , Veerabadhran Gopalakrishnan , Alex Deucher Subject: [PATCH 6.1 169/239] drm/amdgpu/jpeg: Remove harvest checking for JPEG3 Date: Mon, 15 May 2023 18:27:12 +0200 Message-Id: <20230515161726.741819495@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230515161721.545370111@linuxfoundation.org> References: <20230515161721.545370111@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Saleemkhan Jamadar commit 5b94db73e45e2e6c2840f39c022fd71dfa47fc58 upstream. Register CC_UVD_HARVESTING is obsolete for JPEG 3.1.2 Signed-off-by: Saleemkhan Jamadar Reviewed-by: Veerabadhran Gopalakrishnan Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.1.x Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c index c55e09432e26..1c2292cc5f2c 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c @@ -54,6 +54,7 @@ static int jpeg_v3_0_early_init(void *handle) switch (adev->ip_versions[UVD_HWIP][0]) { case IP_VERSION(3, 1, 1): + case IP_VERSION(3, 1, 2): break; default: harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING); -- 2.40.1