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 0754C19AA7E for ; Mon, 24 Jun 2024 16:36:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719246966; cv=none; b=aVx/k92XQ3oKd/CALvmOx7Qh0fXPehHMLbLVUYJhUxNhteruqkmvEAIJr9bhraYSgjVXCrCndsrGtWE4wzJfydSm32+7UyHEnTMaCexCWo2H26cmwF7pA5vDUDY8Aj0BYi6WnVSRCeM9P+Yl9VRsvnTctqZgbMVtpZQOMjRQjJQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719246966; c=relaxed/simple; bh=44v63Foj7JHcauDgUJXoyPtPYzEG2O7V4g4wm/3dicU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=QpHqpu/KgSdX3pGfPCEsMfiekgu7kvZkU0D+iJwZiHhgM1PSPZLGVM5uhyNhlOzZgoW08JTHwTmPQM8ostj+2ryV3BoSCDNy/a6LhBnnyycpc0ut8DJHnoKLmP9PEIVt4q6ys8o9Txdua7yIAYHgChJ/3z/CkmaTBFacuALnycQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yYkWlozk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yYkWlozk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35937C32786; Mon, 24 Jun 2024 16:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719246965; bh=44v63Foj7JHcauDgUJXoyPtPYzEG2O7V4g4wm/3dicU=; h=Subject:To:Cc:From:Date:From; b=yYkWlozk14Qs6sVyUIRqxYBOoAb7nJ0TCSapeSbks9ANMWnVjLW1oAK7Rg/kLHEBU ob9PF/bye5H96oFtXt4UJsC62hFKQDSrapuh9Q9O5C5AY4V9vmnNflD1oij4QFcmy/ CkQos36/LbtwIj//1l8el+O4aKsUcLaTTgLx/JCs= Subject: FAILED: patch "[PATCH] drm/amd/display: prevent register access while in IPS" failed to apply to 6.9-stable tree To: hamza.mahfooz@amd.com,alexander.deucher@amd.com,roman.li@amd.com Cc: From: Date: Mon, 24 Jun 2024 18:35:54 +0200 Message-ID: <2024062454-portable-grinch-582f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.9.y git checkout FETCH_HEAD git cherry-pick -x 56342da3d8cc15efe9df7f29985ba8d256bdc258 # git commit -s git send-email --to '' --in-reply-to '2024062454-portable-grinch-582f@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 56342da3d8cc15efe9df7f29985ba8d256bdc258 Mon Sep 17 00:00:00 2001 From: Hamza Mahfooz Date: Mon, 3 Jun 2024 10:16:45 -0400 Subject: [PATCH] drm/amd/display: prevent register access while in IPS We can't read/write to DCN registers while in IPS. Since, that can cause the system to hang. So, before proceeding with the access in that scenario, force the system out of IPS. Cc: stable@vger.kernel.org # 6.6+ Reviewed-by: Roman Li Signed-off-by: Hamza Mahfooz Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e426adf95d7d..e9ac20bed0f2 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -11437,6 +11437,12 @@ void amdgpu_dm_trigger_timing_sync(struct drm_device *dev) mutex_unlock(&adev->dm.dc_lock); } +static inline void amdgpu_dm_exit_ips_for_hw_access(struct dc *dc) +{ + if (dc->ctx->dmub_srv && !dc->ctx->dmub_srv->idle_exit_counter) + dc_exit_ips_for_hw_access(dc); +} + void dm_write_reg_func(const struct dc_context *ctx, uint32_t address, u32 value, const char *func_name) { @@ -11447,6 +11453,8 @@ void dm_write_reg_func(const struct dc_context *ctx, uint32_t address, return; } #endif + + amdgpu_dm_exit_ips_for_hw_access(ctx->dc); cgs_write_register(ctx->cgs_device, address, value); trace_amdgpu_dc_wreg(&ctx->perf_trace->write_count, address, value); } @@ -11470,6 +11478,8 @@ uint32_t dm_read_reg_func(const struct dc_context *ctx, uint32_t address, return 0; } + amdgpu_dm_exit_ips_for_hw_access(ctx->dc); + value = cgs_read_register(ctx->cgs_device, address); trace_amdgpu_dc_rreg(&ctx->perf_trace->read_count, address, value);