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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A614C43215 for ; Wed, 27 Nov 2019 21:20:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6659A21736 for ; Wed, 27 Nov 2019 21:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889611; bh=5yemM2jPWun0Szk6nsZE3AnqlsD35Qi3e+oCLqnavF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fYXUSKQFgnNIhrJmTaq7bT0/W+3lXNxG/G4tFgp14uH4Z2rDPkI5AdtjdemNpaZMb 7KSRSJBHae54QrIcUGKWmLFwlv74zZF4iU0rv6qUaLkBUrgdwreYH9RJO8xNX/yki4 uVACcfpD5kU3jr82L9Qo8N6TnVX9Kba3wr6crvFQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731053AbfK0VUK (ORCPT ); Wed, 27 Nov 2019 16:20:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:36156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728997AbfK0VJZ (ORCPT ); Wed, 27 Nov 2019 16:09:25 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE7CE21555; Wed, 27 Nov 2019 21:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888965; bh=5yemM2jPWun0Szk6nsZE3AnqlsD35Qi3e+oCLqnavF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdcbYrHF9BpZxeEjw3IGL65OsB67E89KM7vLnEG7eNcCxGMP6o1visEEOqSOYSOPy 0JBVLCDMkZmKwN39igWe/tBIxwP7kjz0Q3NZmV4JLlnxzixPuMaRp/dp7sbOZ0CFNJ r2jO0UVS2uQGu6PuMEtibFNJzwPs6GZB6e80wiP8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaojie Yuan , Evan Quan , Alex Deucher Subject: [PATCH 5.3 30/95] drm/amdgpu: disable gfxoff when using register read interface Date: Wed, 27 Nov 2019 21:31:47 +0100 Message-Id: <20191127202856.736039714@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Deucher commit c57040d333c6729ce99c2cb95061045ff84c89ea upstream. When gfxoff is enabled, accessing gfx registers via MMIO can lead to a hang. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205497 Acked-by: Xiaojie Yuan Reviewed-by: Evan Quan Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -635,15 +635,19 @@ static int amdgpu_info_ioctl(struct drm_ return -ENOMEM; alloc_size = info->read_mmr_reg.count * sizeof(*regs); - for (i = 0; i < info->read_mmr_reg.count; i++) + amdgpu_gfx_off_ctrl(adev, false); + for (i = 0; i < info->read_mmr_reg.count; i++) { if (amdgpu_asic_read_register(adev, se_num, sh_num, info->read_mmr_reg.dword_offset + i, ®s[i])) { DRM_DEBUG_KMS("unallowed offset %#x\n", info->read_mmr_reg.dword_offset + i); kfree(regs); + amdgpu_gfx_off_ctrl(adev, true); return -EFAULT; } + } + amdgpu_gfx_off_ctrl(adev, true); n = copy_to_user(out, regs, min(size, alloc_size)); kfree(regs); return n ? -EFAULT : 0;