From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4E89643D50E; Tue, 16 Jun 2026 15:09:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781622542; cv=none; b=BsAKJ4nyY3beL4jsB33tDw0It/M+sBPIrfUHBQLwyHsGRrQazOD3I65jihmLu3L+61brurXCKj6gutZoRd7YbxXFqUm7BR+5SGeYWipkOZKq5pH32C4yQa5mYYlQb+ZJ8ZssSZHFyOP1K1kK7oAVg/Kaiy2jFmXf8B+CG94mOAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781622542; c=relaxed/simple; bh=mIh9vPagVUdGEqF6ocQ5kW6lsnFCAHv/UC2MWauUKlE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tMm1G/Ztg9J7rJf8voXDSiTtS13TDG6/QfyIpFt0nhzSem6Kb4Wymf+l/zccjAUymTp58cU6S/iAuU3+82VFeE2Bh2gIlqp7CswNcsczwJtKBeIb+iwgzc2NL8Rdl0zlBIzYLcdbwTKu0t6pE4rtbfAerRbnzoB3JPyoMYcK6Eg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zkSWAmWn; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zkSWAmWn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 568961F00A3A; Tue, 16 Jun 2026 15:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781622540; bh=YA4Mtsjv4sc1BSfgdJzaCuDUOYH40SjA3JKQY9boMpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zkSWAmWnfDhTcSoM5iguPKHoLAkmAFe1qj/rXfu7G6uyPyVjupdKPu4iY4BsJrUBn oSqLQVJ6H6E8ONK9hLiFhJY7s2fX97uB1WXKFbAdcFSUg6gL9kdrdHRltLPX0M5vQ1 BcTv//azwpiuD6kAcKAkFrm2IyYA6x/kvNk+poQU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Carlos Eduardo Gallo Filho , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Thomas Zimmermann , Sasha Levin Subject: [PATCH 6.1 005/522] drm: Remove plane hsub/vsub alignment requirement for core helpers Date: Tue, 16 Jun 2026 20:22:32 +0530 Message-ID: <20260616145125.610761268@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Carlos Eduardo Gallo Filho [ Upstream commit f2f455981a34ce8ca88a41458c09494b387d344f ] The drm_format_info_plane_{height,width} functions was implemented using regular division for the plane size calculation, which cause issues [1][2] when used on contexts where the dimensions are misaligned with relation to the subsampling factors. So, replace the regular division by the DIV_ROUND_UP macro. This allows these functions to be used in more drivers, making further work to bring more core presence on them possible. [1] http://patchwork.freedesktop.org/patch/msgid/20170321181218.10042-3-ville.syrjala@linux.intel.com [2] https://patchwork.freedesktop.org/patch/msgid/20211026225105.2783797-2-imre.deak@intel.com Signed-off-by: Carlos Eduardo Gallo Filho Reviewed-by: André Almeida Signed-off-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20230926141519.9315-2-gcarlos@disroot.org Signed-off-by: Sasha Levin --- include/drm/drm_fourcc.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h index 532ae78ca747e6..ccf91daa430702 100644 --- a/include/drm/drm_fourcc.h +++ b/include/drm/drm_fourcc.h @@ -22,6 +22,7 @@ #ifndef __DRM_FOURCC_H__ #define __DRM_FOURCC_H__ +#include #include #include @@ -279,7 +280,7 @@ int drm_format_info_plane_width(const struct drm_format_info *info, int width, if (plane == 0) return width; - return width / info->hsub; + return DIV_ROUND_UP(width, info->hsub); } /** @@ -301,7 +302,7 @@ int drm_format_info_plane_height(const struct drm_format_info *info, int height, if (plane == 0) return height; - return height / info->vsub; + return DIV_ROUND_UP(height, info->vsub); } const struct drm_format_info *__drm_format_info(u32 format); -- 2.53.0