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 8290D31D726 for ; Thu, 11 Dec 2025 20:41:31 +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=1765485693; cv=pass; b=h1F3IAy7vzxGsgweei/7/OQ1nOV+MqEG3P6Mz1lVlNH9aKmnb9ezAUtSwT/ysmUwNaPQshTXTj2ioeQWwKoGZv/0x+xXFnIYXdmowp5R5rHO8hTQIdacFWCM558pc9DG6Hgc0oAo6XnIl65xhyUTStC5hj+lDDe+GY7Cc7cQzQg= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485693; c=relaxed/simple; bh=w60TlGu/HbwiQT7TsAxKJ6Tjmf+z/UOiszujtwkutFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P6Fzya2Vspagjd8wrnStk73AjfrWANT4iwTIwl5vy97HssdDUKDRbKSH2rLTdgKaqrEMDopjec4QpM8EJXT4BQ+UHT4NdtU55di+Xhzt04pWHznsinbq/5brkmEpJXj6owfqBHtlDdnNzdRktXn0sM6Jjywmqt7x4yJcvdC2FbM= 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=OgtUxXUc; 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="OgtUxXUc" ARC-Seal: i=1; a=rsa-sha256; t=1765485669; cv=none; d=zohomail.com; s=zohoarc; b=TG4KT9o+yZsoqhwhh3xC/tJN1is0Nehf/vg2/ZxmpprFb/G4wvMBW6UwUdyN6n/g1qaZ6G97r+cOiUmznmvsnin5iCL4wy22zAD2CIQgWLvrWHlZCa45l4EbZnvXPyVI+dJmBHmN0SG3N31YmGAOHFbCNNvbji3vh0CrDfn69oI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765485669; 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=JBSVTApRGFO6ipPPb6rgBGPYE/Z13lbAZXToGPqvWnU=; b=b4Vgcudi24VqlzB9l2v0xVroPPfJZvBxvows661kpU9HL0b0pJb15v4BI5EfEeF3jA0wWENh9z7R9DuoH8GAlUDswpAPUYreWtql93rSWjQzJoSmolP/NMXNDd8IDf/EV47L0kXcX0DeoeXEyBYJ/ve40iMq4hfFtJJ07uLgRrk= 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=1765485669; 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=JBSVTApRGFO6ipPPb6rgBGPYE/Z13lbAZXToGPqvWnU=; b=OgtUxXUc6c+Uf9NUx1fYnRvelRahKeqSWL707Sd9ip+8hKWlXJi5DIxsW2ckoohU N1/TPM4XZAoGH3dNxNk5Ae89DhizZr+tIHh8yS5oleZDxIN/gI8Tli60Ts6yS7coap9 W5SJDBJaKmTD901NkP4CoC3hpkrzk2T4Ey4TRSss= Received: by mx.zohomail.com with SMTPS id 1765485667363440.498232990705; Thu, 11 Dec 2025 12:41:07 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 11 Dec 2025 21:40:34 +0100 Subject: [PATCH v4 4/8] drm/rockchip: vop2: Enforce scaling workaround in plane_check 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-4-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 It seems only cluster windows are capable of applying downscaling when the source region has an odd width. Instead of applying a workaround inside atomic_update, fail the plane check if this is requested. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 9d715d7659af..6d4f22872e67 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -998,6 +998,7 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, struct drm_crtc *crtc = pstate->crtc; struct drm_crtc_state *cstate; struct vop2_video_port *vp; + struct vop2_win *win = to_vop2_win(plane); struct vop2 *vop2; const struct vop2_data *vop2_data; struct drm_rect *dest = &pstate->dst; @@ -1065,6 +1066,16 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, return -EINVAL; } + /* + * This is workaround solution for IC design: + * esmart can't support scale down when src_w % 16 == 1. + */ + if (!vop2_cluster_window(win) && src_w > dest_w && (src_w & 1)) { + drm_dbg_kms(vop2->drm, + "Esmart windows cannot downscale odd-width source regions\n"); + return -EINVAL; + } + return 0; } @@ -1226,16 +1237,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, WARN_ON(src_w < 4); WARN_ON(src_h < 4); - /* - * This is workaround solution for IC design: - * esmart can't support scale down when src_w % 16 == 1. - */ - if (!vop2_cluster_window(win) && src_w > dsp_w && (src_w & 1)) { - drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n", - vp->id, win->data->name, src_w); - src_w -= 1; - } - if (afbc_en && src_w % 4) { drm_dbg_kms(vop2->drm, "vp%d %s src_w[%d] not 4 pixel aligned\n", vp->id, win->data->name, src_w); -- 2.52.0