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 9B92C37A8B6; Mon, 5 May 2025 23:16:16 +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=1746486977; cv=none; b=b7Z2wcuSspn7tgS6OzxEwZvvyHOeb9vsm4W1lvrc/tVSdnjvFFV9ACoRPkR97RVm4er2MO4IVOu6OLq+wBMz4hBlYfGze73dMTtMwVo7Y6mQ1FoLsQDJVYrUSXnC10Z2qaObXNzjrre+mS6gaOAfIw1QG7dbHgYt/6I4bcsHhHk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486977; c=relaxed/simple; bh=RIErKMVGtM2quZHl9rmspMuPKcpJzdebSl75GX8Lo9k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WbXKqKtFo3tLs+WwPMspCBMG/Lv4h+VTOeVTpC8I3uXLWBh6L9kdelT+iiBZ4GXstpm2gjntjsTS1zP4LpYutbV8T4HWCCZDiZSin0NlVu2/M9VZxxGToXVUq1tVfx9JxWp60gVhMdBU6O0GqVwgKmObNZCPTA7wvQuR/wZhgMQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=otYctlR1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="otYctlR1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F33CFC4CEE4; Mon, 5 May 2025 23:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486976; bh=RIErKMVGtM2quZHl9rmspMuPKcpJzdebSl75GX8Lo9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=otYctlR146UdW99Cl4pwbZPlV2sCTlGxoOPWoHH68iwf45U58pm53Pf7R15vGgeUI gLBVX4L7eylIl/OvjZw0mQ/o5ZWVdhACda9UmZ4B01EUWYbXSO24FrpV+dgHSA1Yal +XIuL+Gd7UGhC7FUlenGWg468Iijdhu5MF+WW60QRtMe9Ltda3ukfpqILBCOXJGu1o zDRio+tp+oCUPt+4uz8vJ2jWfeJH5F0b+qC1MQ8bJIheOXuPCIAy6zEqvgJfHgFzu5 JVDKkaRJEdbUuwocOXzMYbtunJXn7vZwKowgAvv7hkEbM2X09AhUQCVyQD3z6Vz/z+ 1d+zJCS5G6ykQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yihan Zhu , Samson Tam , Zaeem Mohamed , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 089/153] drm/amd/display: handle max_downscale_src_width fail check Date: Mon, 5 May 2025 19:12:16 -0400 Message-Id: <20250505231320.2695319-89-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231320.2695319-1-sashal@kernel.org> References: <20250505231320.2695319-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.181 Content-Transfer-Encoding: 8bit From: Yihan Zhu [ Upstream commit 02a940da2ccc0cc0299811379580852b405a0ea2 ] [WHY] If max_downscale_src_width check fails, we exit early from TAP calculation and left a NULL value to the scaling data structure to cause the zero divide in the DML validation. [HOW] Call set default TAP calculation before early exit in get_optimal_number_of_taps due to max downscale limit exceed. Reviewed-by: Samson Tam Signed-off-by: Yihan Zhu Signed-off-by: Zaeem Mohamed Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c index 0601c17426af2..27932a32057e3 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c @@ -386,11 +386,6 @@ bool dpp3_get_optimal_number_of_taps( int min_taps_y, min_taps_c; enum lb_memory_config lb_config; - if (scl_data->viewport.width > scl_data->h_active && - dpp->ctx->dc->debug.max_downscale_src_width != 0 && - scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width) - return false; - /* * Set default taps if none are provided * From programming guide: taps = min{ ceil(2*H_RATIO,1), 8} for downscaling @@ -428,6 +423,12 @@ bool dpp3_get_optimal_number_of_taps( else scl_data->taps.h_taps_c = in_taps->h_taps_c; + // Avoid null data in the scl data with this early return, proceed non-adaptive calcualtion first + if (scl_data->viewport.width > scl_data->h_active && + dpp->ctx->dc->debug.max_downscale_src_width != 0 && + scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width) + return false; + /*Ensure we can support the requested number of vtaps*/ min_taps_y = dc_fixpt_ceil(scl_data->ratios.vert); min_taps_c = dc_fixpt_ceil(scl_data->ratios.vert_c); -- 2.39.5