From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09265178372 for ; Thu, 11 Dec 2025 22:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765492867; cv=none; b=j2rhhXfH+IkAPFrVLvtZbhAy9qmT0vhZmObi2c1FTtKGmO7SHxJcBsu39J212ZrVh4RkX9V+RZ0o+0j03WBf88jpybqRygZ/xWvNe7MWoLkJaBx5WfjIue016YRDjif7f9OZIiD9Ljg4jsPBtkzL4Nqr7jUHvY7R1o1KEpaWZoo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765492867; c=relaxed/simple; bh=1CdqOP+D8QN7ICoJN/Ggi6h5tRz8d+o97GJ+ztdp7v4=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NqPkxTFV3uQQKn3K3m6hIU9T+EKQpZjn3CuBPnUBn2AodmQXGcOD0wQMSLuoZLMIgvBPN6I//+reJVDZqKT5b3KSTauRttg5HyXE7az4V//aD0VtPk4JESqHEM60y43Jixz9hw5B9zoRatqc49B3FhFl0fOPik5hY3bOaW8XHHk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Z0eTUlgn; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z0eTUlgn" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-477770019e4so6172835e9.3 for ; Thu, 11 Dec 2025 14:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765492864; x=1766097664; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=oc1kTCaPU/Up3VBWwNqeucLbtfTNSR3ZKTbW8ftdd+s=; b=Z0eTUlgnsiCkLORNbVuXFro3FQiTcGGWaIr4g4LvnJMPqW1ohlP/IlO4JGnkieZLIH 63vJDb66a44t0BH8X0f7kh3vhkkLD57a/LK/xLeky4hKoAr0vP37+qKvePy6XhHulOYk aH0fdlo4g7ButEkveeIFT01ykyu3A3qWNZmdZkdBqI6sDbxbOvlAa/BdPNV3Ag+6iKDs 5SZjjrSxjZfNwCnDVr6kCbfdVf3qQBfPTX9hCPsq7ZqYazgzaEjqFpmCJo21XPw8Fuzi 77IkbpczSVXRQFD9EO29YEeAp+2BtrLokSnn88plynr68geT56p4zELUBWZYFwdw7AqK JxhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765492864; x=1766097664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=oc1kTCaPU/Up3VBWwNqeucLbtfTNSR3ZKTbW8ftdd+s=; b=bauFQRH5yYgd10hBEGlXI9BMWkZ48K/hnbwLonnQYuzsDvvRllNdgPTDkZWg6MJgoh Lruh23AfFEb6ylmMTKlBSgVhKiChK0pBcbjDf7880jkN3kn2xj+KGwMcl/OqcMDTrCwF X96o+dHif1uqhsXEA2oV9P/fir0OXs8urXy4itKJCS7DN5TwQQJxOk/ehAV0qLAKX5/J hw9LaWirvvNfhC3NpFRKq2LKiRQ/Wtah7nifCHQaOVb5leggIdFWO5bCX4BRRGZEDByw NgpDnwYeyuCzkWk6cwdZ+Uwrm63feZxBkXWmxpJQFWU/5UtH2DApLhcdd+Jo8N7EofLj Q32Q== X-Forwarded-Encrypted: i=1; AJvYcCWZ3dLZsEqXT0KJjT8E8y8nzQrmdoRvUQpUtPkZMAaYmCxlTbBdYRLC0F20ka5HcD1jHBaLIjHNOly9BHo=@vger.kernel.org X-Gm-Message-State: AOJu0YwpSH0xtGfW3vEOTK0yJIYt9vRc/xB0wqhNTyh/3EHp+YT7jOOD MLR8B4Ou68JBb3e3Y3Zvw/kY98LyJIqKiogs8EuPUiC1iSbUkrmUsQzW X-Gm-Gg: AY/fxX4nCAQyA9MCE27TJC/y4mLhAxcs4eb0wZoNQxj02NFIhYJpknytmQMKYWSJvmT eHDsGpKqVNJ47wjbWdoXUqQl5tQXK1BrITOuTdB41X/0ZmfzrrQIl2eNEB6NvtNLGfCEh6C+bPX LTNYAU5xdgbg5AS5/d3oIcX1mSEFUcbQyLTRINNzLwnosnB9PZ3Z/6XY2YkDBifT194IOhv+QAT 5dagmnpXXJTZEgvsqLs1pjONhlGDstEkPTaY5j4D6gCKNhc14c8RtwQLp8RiJn104GpsFjYJ6eI ykzn7BJNa5djIXnoc5r2eGap7yJHF0iga9Esw9vavV2KGMz300rclamr0q//njNwLcizWyPI/EI Hf8haMUU3TrQ47iwZdDIyuA4/zceukv1as/B35sMLX29enBe9H/OMOqOL3b4vYpGkqg1lw2SGgT 1zCLODLh4ZDT16+fTzm5CRmbpH1vzE9nEfW+b7I45bO4HjxMVQTlii X-Google-Smtp-Source: AGHT+IG1bTT2BZs5zspIv+MpSidSuvbOeyRhbmBxmTJnjzWF8kBNNUW7JY1Buz+51tBubecYulXc/w== X-Received: by 2002:a05:600c:1991:b0:47a:80f8:82ab with SMTP id 5b1f17b1804b1-47a83843776mr80137805e9.24.1765492864263; Thu, 11 Dec 2025 14:41:04 -0800 (PST) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a8f4c624esm326205e9.15.2025.12.11.14.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 14:41:04 -0800 (PST) Date: Thu, 11 Dec 2025 22:41:02 +0000 From: David Laight To: Nicolas Frattaroli Cc: Sandy Huang , Heiko =?UTF-8?B?U3TDvGJuZXI=?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chaoyi Chen , 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 Subject: Re: [PATCH v4 2/8] drm/rockchip: vop2: Switch impossible pos conditional to WARN_ON Message-ID: <20251211224102.5e079d70@pumpkin> In-Reply-To: <20251211-vop2-atomic-fixups-v4-2-5d50eda26bf8@collabora.com> References: <20251211-vop2-atomic-fixups-v4-0-5d50eda26bf8@collabora.com> <20251211-vop2-atomic-fixups-v4-2-5d50eda26bf8@collabora.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) 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=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 11 Dec 2025 21:40:32 +0100 Nicolas Frattaroli wrote: > 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); You need to do something when the tests fail. Carrying on regardless is never right. David > > /* > * This is workaround solution for IC design: >