From patchwork Tue Dec 17 20:45:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Melissa Wen X-Patchwork-Id: 13912487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AB66E77184 for ; Tue, 17 Dec 2024 20:50:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDA5B10EA67; Tue, 17 Dec 2024 20:50:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="czV657ph"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 678B610E090; Tue, 17 Dec 2024 20:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=7mGh5BOud1iBcSK4bHOV27UVzeac5Tmql3qIg/8sObA=; b=czV657phUnops84AB5VgYGgZFF KQHKD2yUB4i6oi9DAqDtVJaw15HTbdqPlfM72Ssvzzb634X6TZP5yqznlSFVS32fYI1R5WhTM1fqw NW+9Rxm4tK6u6TjtFm4fCXrAKNCttNXfoNKoHZuDRWoKEoEI5KFeGYhg+wn4VVDd2vNRmy/hLxQm+ rvpp1kQHnfHSJpszN7HGo48KbnbUxn9yJTfbuhmi0He/WgsGoBlrXcZ8d57xf28vhJHbz7OgyaAIX ayfneokzY8Odi0TwI7Rt1/cqr6KL322eJucLaXMLvHSnzX17E/CzdjZjojLY3ZWooTrKIttK7g3UB Fm8zrwMw==; Received: from [179.214.71.67] (helo=killbill.home) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1tNeWc-004X2k-76; Tue, 17 Dec 2024 21:50:38 +0100 From: Melissa Wen To: airlied@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, daniel@ffwll.ch, harry.wentland@amd.com, pekka.paalanen@collabora.com, Rodrigo.Siqueira@amd.com, sunpeng.li@amd.com, Xinhui.Pan@amd.com, zaeem.mohamed@amd.com Cc: Mario Limonciello , Timur Kristof , Victoria Brekenfeld , =?utf-8?q?Michel_D=C3=A4nzer?= , Fabio Scaccabarozzi , Matthew Schwartz , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-dev@igalia.com Subject: [PATCH 0/3] drm/amd/display: fixes for kernel crashes since cursor overlay mode Date: Tue, 17 Dec 2024 17:45:02 -0300 Message-ID: <20241217205029.39850-1-mwen@igalia.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, Some issues have been found by Cosmic users of AMD display since the introduction of cursor overlay mode: page fault and divide errors causing interface freezes. Both are 100% reproducible and affects multiple HW versions. Patch 1 addresses the page fault error by resolving the definition mismatch around the number of surfaces supported by the hw, where two different values (MAX_SURFACES and MAX_SURFACE_NUM) would be taken through the DC surface updates flow. The regular flow take MAX_SURFACES == 3 into account and commit_minimal_transition_state uses MAX_SURFACE_NUM == 6. I noticed that Leo Li has proposed this change in a previous discussion [1], so I added a Suggested-by tag. Patch 2 expands the maximum number of surfaces to four, since it's supported by the hw. Also, this amount accomodates current needs, avoiding `dc_state_add_plane` complaints of not enough resource. Note that it somehow reverts the change proposed by [2]. Related AMD issues: - https://gitlab.freedesktop.org/drm/amd/-/issues/3693 - https://gitlab.freedesktop.org/drm/amd/-/issues/3594 Patch 3 fixes a kernel oops due to division by zero error by checking if the destination scale size is zero, avoiding calculation and just setting the out-scale size to zero, similar to what is done by drm_calc_scale(). Even though the missing check in dm_get_plane_scale() wasn't introduced by cursor overlay mode, AFAIU the cursor mode assessment happens before plane state checks, so amdgpu_dm_plane_helper_check_state() can't prevent dm_crtc_get_cursor_mode() taking an invisible plane into account. Related AMD issue: - https://gitlab.freedesktop.org/drm/amd/-/issues/3729 Other previous discussions can be found at: - https://lore.kernel.org/amd-gfx/20241114143741.627128-1-zaeem.mohamed@amd.com/ - https://lore.kernel.org/amd-gfx/20240925154324.348774-1-mwen@igalia.com/ Thanks in advance for any feedback. Melissa [1] https://lore.kernel.org/amd-gfx/20241025193727.765195-2-zaeem.mohamed@amd.com/ [2] https://gitlab.freedesktop.org/agd5f/linux/-/commit/3cfd03b79425c Melissa Wen (3): drm/amd/display: fix page fault due to max surface definition mismatch drm/amd/display: increase MAX_SURFACES to the value supported by hw drm/amd/display: fix divide error in DM plane scale calcs drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_state.c | 8 ++++---- drivers/gpu/drm/amd/display/dc/dc.h | 4 ++-- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 1 - drivers/gpu/drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) Reviewed-by: Rodrigo Siqueira