From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 AD7DD31B804 for ; Thu, 11 Dec 2025 20:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485687; cv=pass; b=O2+c+E/tCRa22GW7UsDNcgIAd8cTRoBSayuEPHuUx93IZtPIw0qx5GeQBsSXkxmFnvtpEtF1E08Fak7TXUni5XkgYKquU8FCVAKH1RFymk365/yaQg2Yol5+rlaw1IngZxH0WbZ9nGLmpdLKReqdv48MeHUE7TfCZ60GpjzwUvQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485687; c=relaxed/simple; bh=82uMyyiluSqW5YQumbrtY/eXvv5KG0Qv+Rw8sfrSY5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JW9Dd+Sd8FmuANDphgdUpsudQ/vCiFU9uT4XmOlYktVxeE6uyFCvvf1OIZF+0fzvbxs/UrETwvgHPHIrHSIbrIqWteA0EOZfFoLGebuYanEc0OJNKdyhd/iPahj4DLPWILAIojjsMwOUP3tMi/XHZM/0wpkj7qaMJ3TpoPtDj+I= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=Zbky7nF5; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="Zbky7nF5" ARC-Seal: i=1; a=rsa-sha256; t=1765485661; cv=none; d=zohomail.com; s=zohoarc; b=glCjeBqLM9W9eVr4LVPZ/ofWxXgA8VNn1/2fDoxkfbUcdrdsYspmbfOYPbZ5a+B2t1FFNPDEEkYRIi4eDGN71gGYZ104QET6Ay4lb54g5ocVn+Sr87HEfsRt0FQ43RSbI+YXruiRt9atIRSRttJJY51YnNxPvdp09iNW/U/Xowc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765485661; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=p8rzuw22G5hQ+PO+mu50soCKPQPRHc3OuYqSu+o6ifI=; b=GI4gM9o+zt2o96LBPPOv4IMpIs0GhFlNcHtv94jiJISRA65goZxuQWQ1vJTt119i9La326qFes2pKm1bbByNw+7PpV1pGv0jyE2XI1BN/VHxQ3XBwaaElp0+UhZaNDDeiUk8mUis813+Fxl9FbVlVT5eZwQczVNYPKqbKNVjywU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1765485661; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=p8rzuw22G5hQ+PO+mu50soCKPQPRHc3OuYqSu+o6ifI=; b=Zbky7nF5AglguFA8f7zG8TF2qM24nZq5EKsK/AelehONl+cS/S5AoGuQTuQBrTtm rnV8ZG2Jy2g11d4zR0wTVdRgE4zzmmZxDQIWCQ0Q+s66fPbgkNSk4ele3nfBl74DFEr /4mabJqu50zsnpAJTSJKQbuC/bRB06RxReOZ2jJ4= Received: by mx.zohomail.com with SMTPS id 1765485659620252.49953475249447; Thu, 11 Dec 2025 12:40:59 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 11 Dec 2025 21:40:32 +0100 Subject: [PATCH v4 2/8] drm/rockchip: vop2: Switch impossible pos conditional to WARN_ON Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251211-vop2-atomic-fixups-v4-2-5d50eda26bf8@collabora.com> References: <20251211-vop2-atomic-fixups-v4-0-5d50eda26bf8@collabora.com> In-Reply-To: <20251211-vop2-atomic-fixups-v4-0-5d50eda26bf8@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chaoyi Chen Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Stone , kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.14.3 From: Daniel Stone We already clip the plane to the display bounds in atomic_check, and ensure that it is sufficiently sized. Instead of trying to catch this and adjust for it in atomic_update, just assert that atomic_check has done its job. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 29 +++++++++------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 20b49209ddcd..81b3eba07095 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1214,28 +1214,17 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, src_w = drm_rect_width(src) >> 16; src_h = drm_rect_height(src) >> 16; dsp_w = drm_rect_width(dest); - - if (dest->x1 + dsp_w > adjusted_mode->hdisplay) { - drm_dbg_kms(vop2->drm, - "vp%d %s dest->x1[%d] + dsp_w[%d] exceed mode hdisplay[%d]\n", - vp->id, win->data->name, dest->x1, dsp_w, adjusted_mode->hdisplay); - dsp_w = adjusted_mode->hdisplay - dest->x1; - if (dsp_w < 4) - dsp_w = 4; - src_w = dsp_w * src_w / drm_rect_width(dest); - } - dsp_h = drm_rect_height(dest); - if (dest->y1 + dsp_h > adjusted_mode->vdisplay) { - drm_dbg_kms(vop2->drm, - "vp%d %s dest->y1[%d] + dsp_h[%d] exceed mode vdisplay[%d]\n", - vp->id, win->data->name, dest->y1, dsp_h, adjusted_mode->vdisplay); - dsp_h = adjusted_mode->vdisplay - dest->y1; - if (dsp_h < 4) - dsp_h = 4; - src_h = dsp_h * src_h / drm_rect_height(dest); - } + /* drm_atomic_helper_check_plane_state calls drm_rect_clip_scaled for + * us, which keeps our planes bounded within the CRTC active area + */ + WARN_ON(dest->x1 + dsp_w > adjusted_mode->hdisplay); + WARN_ON(dest->y1 + dsp_h > adjusted_mode->vdisplay); + WARN_ON(dsp_w < 4); + WARN_ON(dsp_h < 4); + WARN_ON(src_w < 4); + WARN_ON(src_h < 4); /* * This is workaround solution for IC design: -- 2.52.0