From nobody Thu Apr 9 23:26:48 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (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 7E97F3446AB for ; Thu, 5 Mar 2026 08:00:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772697607; cv=none; b=THtWuSJ3BDhB3FYOWaICtAGEJLxYogh5Fy1yvPIZKs6ZFI81oxksaEayA4lNJ58XZmXih7Yb6D+AY1l+LqtHH+b9F5l/C9cENtXgnXAqGlvnwiWtKGgyUF/qRwhQCeCzBLho2p77BIpE3g3JMjUPTTqpJXQcMy0jMmSAEmqS/VA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772697607; c=relaxed/simple; bh=5Gw0+NpM05LmELYw+OwRK3Z1+BQzT6PRLt/1o9p0vxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lObnfAap1n1DeJNd2qns5/sSSTgOtQ2frpEyyl1DNxLkH38ebUDuO4NQS5S43l5bOt4C968ubimFETtUhBO/Ev59NUqrhdpxqjthSN9x5IUxUxcLy3hl7zekVO7YqTM5DbluWDUmc50NxKGJl7ULK7FiPUBwdgEOuJfxqIHXKLo= 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.21 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.103.14]) by APP-01 (Coremail) with SMTP id qwCowACHL2vqN6lpVpFHCQ--.856S3; Thu, 05 Mar 2026 15:59:55 +0800 (CST) From: Icenowy Zheng To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Icenowy Zheng Subject: [PATCH drm-misc-next v2 1/3] drm: verisilicon: make vs_format conversion function return int Date: Thu, 5 Mar 2026 15:59:24 +0800 Message-ID: <20260305075926.3642501-2-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> References: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> 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: qwCowACHL2vqN6lpVpFHCQ--.856S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr1Utr47Xw17Cr17tw1DWrg_yoW8urykpF 47CrZFqFs5tw4aqF9rJayUK343Ca95Ga4xWr4kGw1Y9r15KFyUAr1DGrWFkr98Gr47Gw1I vFsakr1DZry2kFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBm14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l84 ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_Jw0_GFyl42 xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWU GwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI4 8JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4U MIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I 8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfU5a0mUUUUU X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" This is for further proper invalid drm_format handling before committing the plane state change. The return value is not yet checked yet, and will be checked in atomic_check in the future. Signed-off-by: Icenowy Zheng Reviewed-by: Thomas Zimmermann --- Changes in v2: - Move a bogus #include clause to the next patch. drivers/gpu/drm/verisilicon/vs_plane.c | 6 ++++-- drivers/gpu/drm/verisilicon/vs_plane.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index 2f3953e588a34..fa88ed14e41d7 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_plane.c @@ -12,7 +12,7 @@ =20 #include "vs_plane.h" =20 -void drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format) +int drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format) { switch (drm_format) { case DRM_FORMAT_XRGB4444: @@ -62,7 +62,7 @@ void drm_format_to_vs_format(u32 drm_format, struct vs_fo= rmat *vs_format) vs_format->color =3D VSDC_COLOR_FORMAT_A2R10G10B10; break; default: - pr_warn("Unexpected drm format!\n"); + return -EINVAL; } =20 switch (drm_format) { @@ -101,6 +101,8 @@ void drm_format_to_vs_format(u32 drm_format, struct vs_= format *vs_format) =20 /* N/A for non-YUV formats */ vs_format->uv_swizzle =3D false; + + return 0; } =20 dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *fb, diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index 41875ea3d66a5..a88cc19f2202e 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -63,7 +63,7 @@ struct vs_format { bool uv_swizzle; }; =20 -void drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format); +int drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format); dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *fb, const struct drm_rect *src_rect); =20 --=20 2.52.0 From nobody Thu Apr 9 23:26:48 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (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 CC77A346A06 for ; Thu, 5 Mar 2026 08:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772697609; cv=none; b=AWYkE2WPsyUNRnGW0CBYavGyIEyYe0ZMAWN4uyGtDAm0SyjX++foFaL++UNgm2BbtOFFNgK+CShhEvfTYfVOZOtiFEhvaz47i8ze844rJmFWvodhY0YQ/zxa9tmaeGi/EHh1ct2Oc8lj2oyhlmDe34le0QnYVbA6AjnbTF9ms9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772697609; c=relaxed/simple; bh=I9gZxtZlChDNsViTa76WZ58TrnNdjsI2t/vzS/s7Q2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GhCLj5qQZRBdfLWkq7hAwW5gvdacZpZjqbRsSjtAfhUQ3ZTtcVMyrIZSdSV3nY011AsAkteZPhbr6pF3byYosDfSgipK+S+HBZM19JT1q3nhZXr+P83BNq8sPQi8geBNF/IfNpxGAJCwIgfxWchjJUIM23UZL0HQ7MoADJA6Dg4= 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.21 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.103.14]) by APP-01 (Coremail) with SMTP id qwCowACHL2vqN6lpVpFHCQ--.856S4; Thu, 05 Mar 2026 15:59:57 +0800 (CST) From: Icenowy Zheng To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Icenowy Zheng Subject: [PATCH drm-misc-next v2 2/3] drm: verisilicon: subclass drm_plane_state Date: Thu, 5 Mar 2026 15:59:25 +0800 Message-ID: <20260305075926.3642501-3-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> References: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> 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: qwCowACHL2vqN6lpVpFHCQ--.856S4 X-Coremail-Antispam: 1UD129KBjvJXoWxJF1fuw4fGr43Aw17Xry8AFb_yoWrCr48pr srAFy5Kr45Aw4DGr9rJw1jy3y3ua18KryIgrZ7GwnavF15try3uF1ktr93CFsxJrW7Gw1f tan2kF4DCr4ayrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBl14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r1q6r43Mx AIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_ Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwI xGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWx JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcV C2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUj5Ef7UUUUU== X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" Create a subclass of drm_plane_state to store hardware-specific state information (e.g. hardware plane format settings) in the future. Signed-off-by: Icenowy Zheng --- Changes in v2: - Add the #include clause for atomic state helpers, which was wrongly placed in the previous patch in v1. - Switch to kzalloc_obj helper for allocating the state. drivers/gpu/drm/verisilicon/vs_plane.c | 41 +++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_plane.h | 14 +++++++ .../gpu/drm/verisilicon/vs_primary_plane.c | 6 +-- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/veris= ilicon/vs_plane.c index fa88ed14e41d7..2fd4fb2a9591c 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_plane.c @@ -6,6 +6,7 @@ #include #include =20 +#include #include #include #include @@ -124,3 +125,43 @@ dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *= fb, =20 return dma_addr; } + +struct drm_plane_state *vs_plane_duplicate_state(struct drm_plane *plane) +{ + struct vs_plane_state *vs_state; + + if (WARN_ON(!plane->state)) + return NULL; + + vs_state =3D kmemdup(plane->state, sizeof(*vs_state), GFP_KERNEL); + if (!vs_state) + return NULL; + + __drm_atomic_helper_plane_duplicate_state(plane, &vs_state->base); + + return &vs_state->base; +} + +void vs_plane_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state) +{ + __drm_atomic_helper_plane_destroy_state(state); + kfree(state); +} + +/* Called during init to allocate the plane's atomic state. */ +void vs_plane_reset(struct drm_plane *plane) +{ + struct vs_plane_state *vs_state; + + if (plane->state) + __drm_atomic_helper_plane_destroy_state(plane->state); + + kfree(plane->state); + + vs_state =3D kzalloc_obj(*vs_state, GFP_KERNEL); + if (!vs_state) + return; + + __drm_atomic_helper_plane_reset(plane, &vs_state->base); +} diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index a88cc19f2202e..12848a72af576 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -63,10 +63,24 @@ struct vs_format { bool uv_swizzle; }; =20 +struct vs_plane_state { + struct drm_plane_state base; +}; + +static inline struct vs_plane_state *state_to_vs_plane_state(struct drm_pl= ane_state *state) +{ + return container_of(state, struct vs_plane_state, base); +} + int drm_format_to_vs_format(u32 drm_format, struct vs_format *vs_format); dma_addr_t vs_fb_get_dma_addr(struct drm_framebuffer *fb, const struct drm_rect *src_rect); =20 +struct drm_plane_state *vs_plane_duplicate_state(struct drm_plane *plane); +void vs_plane_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state); +void vs_plane_reset(struct drm_plane *plane); + struct drm_plane *vs_primary_plane_init(struct drm_device *dev, struct vs_= dc *dc); =20 #endif /* _VS_PLANE_H_ */ diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index e8fcb5958615c..bad0bc5e3242d 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -145,10 +145,10 @@ static const struct drm_plane_helper_funcs vs_primary= _plane_helper_funcs =3D { }; =20 static const struct drm_plane_funcs vs_primary_plane_funcs =3D { - .atomic_destroy_state =3D drm_atomic_helper_plane_destroy_state, - .atomic_duplicate_state =3D drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state =3D vs_plane_destroy_state, + .atomic_duplicate_state =3D vs_plane_duplicate_state, .disable_plane =3D drm_atomic_helper_disable_plane, - .reset =3D drm_atomic_helper_plane_reset, + .reset =3D vs_plane_reset, .update_plane =3D drm_atomic_helper_update_plane, }; =20 --=20 2.52.0 From nobody Thu Apr 9 23:26:48 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (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 31D6B32D0DE for ; Thu, 5 Mar 2026 08:09:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772698199; cv=none; b=CadPCq2bMMIf1uv6rhZLUTBNgWo2+EeUoSU8EMmmvZwb48lLh/rpu0wHqDiOWHLDxMUlazO2nuSp3n6BUKhlr9eI3KgYfodMqRPJvaiXn19pmMzREe4/WaTEDAduqaQQVPuDIY1vuwbEKyrlLoIFs3l8MOuPPgrxzBCMaZBJPkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772698199; c=relaxed/simple; bh=Qv5W0JLfjKSLyNJT0jMlpdRzbDjg+tdMoNiomzATqBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YvBpba0ulBMNnLy+Bg9nIuQl9TrRMBegZbCmv2c+BhPIQfk4uvu5juxCTFcJ4W+KkUV9JOsIfjs28wd33ClZ/GZRE+DDRMh03B4eSlIjL2lbLJ1M+OLzpu5/yXtgOIE1mS2TqjW4hCfKANGK2j5JvnAe06ecCJL4NFIn1/CdyHk= 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.21 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.103.14]) by APP-01 (Coremail) with SMTP id qwCowAA33mlMOqlpp6pHCQ--.1877S2; Thu, 05 Mar 2026 16:09:48 +0800 (CST) From: Icenowy Zheng To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Icenowy Zheng Subject: [PATCH drm-misc-next v2 3/3] drm: verisilicon: fill plane's vs_format in atomic_check Date: Thu, 5 Mar 2026 16:09:46 +0800 Message-ID: <20260305080947.3656864-1-zhengxingda@iscas.ac.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> References: <20260305075926.3642501-1-zhengxingda@iscas.ac.cn> 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: qwCowAA33mlMOqlpp6pHCQ--.1877S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXw1fCF18WryUJFyDWFy5XFb_yoW5Zw1rpr 4DAFyrKr4ftrWUWr9rJr4DtFZxu3Z3GryIgrWDGwnaqF15t343CF1kJrZ3CFs8JrW7Gw4x tanayrnxAw42yaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkG14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU tVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14 v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkG c2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4U MIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUZYFZUUU UU= X-CM-SenderInfo: x2kh0wp0lqwv3d6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" Move the conversion from drm_format to vs_format to atomic_check, which is before the point of no return and can properly bail out. Signed-off-by: Icenowy Zheng --- Changes in v2: - Add non-NULL check for drm_plane_state->fb. drivers/gpu/drm/verisilicon/vs_plane.h | 2 ++ .../gpu/drm/verisilicon/vs_primary_plane.c | 21 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/verisilicon/vs_plane.h b/drivers/gpu/drm/veris= ilicon/vs_plane.h index 12848a72af576..df4b248b52954 100644 --- a/drivers/gpu/drm/verisilicon/vs_plane.h +++ b/drivers/gpu/drm/verisilicon/vs_plane.h @@ -65,6 +65,8 @@ struct vs_format { =20 struct vs_plane_state { struct drm_plane_state base; + + struct vs_format format; }; =20 static inline struct vs_plane_state *state_to_vs_plane_state(struct drm_pl= ane_state *state) diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/d= rm/verisilicon/vs_primary_plane.c index bad0bc5e3242d..ca41c8053ae12 100644 --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c @@ -25,12 +25,20 @@ static int vs_primary_plane_atomic_check(struct drm_pla= ne *plane, { struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); + struct vs_plane_state *new_vs_plane_state =3D state_to_vs_plane_state(new= _plane_state); struct drm_crtc *crtc =3D new_plane_state->crtc; + struct drm_framebuffer *fb =3D new_plane_state->fb; struct drm_crtc_state *crtc_state; + int ret; =20 - if (!crtc) + if (!crtc || !fb) return 0; =20 + ret =3D drm_format_to_vs_format(fb->format->format, + &new_vs_plane_state->format); + if (ret) + return ret; + crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); if (WARN_ON(!crtc_state)) return -EINVAL; @@ -88,11 +96,11 @@ static void vs_primary_plane_atomic_update(struct drm_p= lane *plane, { struct drm_plane_state *state =3D drm_atomic_get_new_plane_state(atomic_s= tate, plane); + struct vs_plane_state *vs_state =3D state_to_vs_plane_state(state); struct drm_framebuffer *fb =3D state->fb; struct drm_crtc *crtc =3D state->crtc; struct vs_dc *dc; struct vs_crtc *vcrtc; - struct vs_format fmt; unsigned int output; dma_addr_t dma_addr; =20 @@ -105,16 +113,15 @@ static void vs_primary_plane_atomic_update(struct drm= _plane *plane, output =3D vcrtc->id; dc =3D vcrtc->dc; =20 - drm_format_to_vs_format(state->fb->format->format, &fmt); - regmap_update_bits(dc->regs, VSDC_FB_CONFIG(output), VSDC_FB_CONFIG_FMT_MASK, - VSDC_FB_CONFIG_FMT(fmt.color)); + VSDC_FB_CONFIG_FMT(vs_state->format.color)); regmap_update_bits(dc->regs, VSDC_FB_CONFIG(output), VSDC_FB_CONFIG_SWIZZLE_MASK, - VSDC_FB_CONFIG_SWIZZLE(fmt.swizzle)); + VSDC_FB_CONFIG_SWIZZLE(vs_state->format.swizzle)); regmap_assign_bits(dc->regs, VSDC_FB_CONFIG(output), - VSDC_FB_CONFIG_UV_SWIZZLE_EN, fmt.uv_swizzle); + VSDC_FB_CONFIG_UV_SWIZZLE_EN, + vs_state->format.uv_swizzle); =20 dma_addr =3D vs_fb_get_dma_addr(fb, &state->src); =20 --=20 2.52.0