From nobody Mon Jun 8 22:55:05 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AADEE28B4FA for ; Mon, 25 May 2026 15:36:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779723395; cv=none; b=UOHTxxiBvHUYTKdkXgxlYFY+MpS9whd2BgZyPIvDJ1N1pfUS/s3E3qNij1qwsK8Fs83yWnE1GkEl9dYUGTNrbefxEMe19hvUbAfu1B2dh3TozcBM49qMnbNS4NDcFstTDv6/DtLpxQQGTcnR4FXafcL3P4aaks4qKmHDdY1xI5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779723395; c=relaxed/simple; bh=7jQDAjTnH4Ux+mfVap2cdB9rXwMABE+7Zdkv0XHhNTU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qjHZ3Rg8y5R58t8Xcwnd52jOPMK71+Y8ZrvXNLrG1wc76MhqYMdf+aJLf80tdoWFAo6AHi9PxeyA/CzdWldrx6GoFudBGVpGO4x0S4c5sSqLQm32TKY0aa7gs1gIiWmOKIdF8GQ6rw8EPPBX+/pS7nt8IrIiy5YCTAMzAlOmi58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from edelgard.fodlan.icenowy.me (unknown [112.94.100.115]) by APP-03 (Coremail) with SMTP id rQCowAAHKeB0bBRqlfhTEg--.434S2; Mon, 25 May 2026 23:36:21 +0800 (CST) From: Icenowy Zheng To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dmitry Baryshkov , Mark Brown Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Icenowy Zheng Subject: [PATCH drm-misc-next] drm: verisilicon: fix build failure of cursor plane code Date: Mon, 25 May 2026 23:36:18 +0800 Message-ID: <20260525153618.1336239-1-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowAAHKeB0bBRqlfhTEg--.434S2 X-Coremail-Antispam: 1UD129KBjvJXoW7uw4xWry8Zw18Gr4fGw1kGrg_yoW8tw4xpw 4DAF98Krs0q3WkGasrJrs2y3y3ua1Fk34IqrZ5GwsaqF13Kr13u3WkJr9rur45JrykW34f JF42yr1DGF4IyrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9j14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xII jxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr 1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxa n2IY04v7MxkF7I0En4kS14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4 AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE 17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMI IF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4l IxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvf C2KfnxnUUI43ZEXa7VUb_Ma5UUUUU== X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" The cursor plane patch was stalled for a too long time that the struct drm_atomic_state parameter of atomic modeset hooks has been changed to struct drm_atomic_commit. Fix this by replacing the parameter's type. All helpers that retrieve information from this struct are also changed so simply replacing the type works. Fixes: 8c4ae2189125 ("drm: verisilicon: add support for cursor planes") Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/verisilicon/vs_cursor_plane.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c b/drivers/gpu/dr= m/verisilicon/vs_cursor_plane.c index acb9854fa67ed..fa4f601dd0c87 100644 --- a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c @@ -40,7 +40,7 @@ static bool vs_cursor_plane_check_coord(int32_t coord) } =20 static int vs_cursor_plane_atomic_check(struct drm_plane *plane, - struct drm_atomic_state *state) + struct drm_atomic_commit *state) { struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); @@ -98,7 +98,7 @@ static void vs_cursor_plane_commit(struct vs_dc *dc, unsi= gned int output) } =20 static void vs_cursor_plane_atomic_enable(struct drm_plane *plane, - struct drm_atomic_state *atomic_state) + struct drm_atomic_commit *atomic_state) { struct drm_plane_state *state =3D drm_atomic_get_new_plane_state(atomic_s= tate, plane); @@ -115,7 +115,7 @@ static void vs_cursor_plane_atomic_enable(struct drm_pl= ane *plane, } =20 static void vs_cursor_plane_atomic_disable(struct drm_plane *plane, - struct drm_atomic_state *atomic_state) + struct drm_atomic_commit *atomic_state) { struct drm_plane_state *state =3D drm_atomic_get_old_plane_state(atomic_s= tate, plane); @@ -132,7 +132,7 @@ static void vs_cursor_plane_atomic_disable(struct drm_p= lane *plane, } =20 static void vs_cursor_plane_atomic_update(struct drm_plane *plane, - struct drm_atomic_state *atomic_state) + struct drm_atomic_commit *atomic_state) { struct drm_plane_state *state =3D drm_atomic_get_new_plane_state(atomic_s= tate, plane); --=20 2.52.0