On Mon, 13 May 2024, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Rename drm_plane_check_pixel_format() to drm_plane_has_format()
> and change the return type accordingly. Allows one to write
> more natural code.
>
> Also matches drm_any_plane_has_format() better.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_atomic.c | 7 ++-----
> drivers/gpu/drm/drm_crtc.c | 6 ++----
> drivers/gpu/drm/drm_crtc_internal.h | 4 ++--
> drivers/gpu/drm/drm_plane.c | 22 ++++++++++------------
> 4 files changed, 16 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index a91737adf8e7..e22560213b8e 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -608,7 +608,6 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
> unsigned int fb_width, fb_height;
> struct drm_mode_rect *clips;
> uint32_t num_clips;
> - int ret;
>
> /* either *both* CRTC and FB must be set, or neither */
> if (crtc && !fb) {
> @@ -635,14 +634,12 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
> }
>
> /* Check whether this plane supports the fb pixel format. */
> - ret = drm_plane_check_pixel_format(plane, fb->format->format,
> - fb->modifier);
> - if (ret) {
> + if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {
> drm_dbg_atomic(plane->dev,
> "[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n",
> plane->base.id, plane->name,
> &fb->format->format, fb->modifier);
> - return ret;
> + return -EINVAL;
> }
>
> /* Give drivers some help against integer overflows */
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 483969b84a30..3488ff067c69 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -789,12 +789,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
> * case.
> */
> if (!plane->format_default) {
> - ret = drm_plane_check_pixel_format(plane,
> - fb->format->format,
> - fb->modifier);
> - if (ret) {
> + if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {
> drm_dbg_kms(dev, "Invalid pixel format %p4cc, modifier 0x%llx\n",
> &fb->format->format, fb->modifier);
> + ret = -EINVAL;
> goto out;
> }
> }
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index 25aaae937ceb..898e0e8b51be 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -272,8 +272,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> /* drm_plane.c */
> int drm_plane_register_all(struct drm_device *dev);
> void drm_plane_unregister_all(struct drm_device *dev);
> -int drm_plane_check_pixel_format(struct drm_plane *plane,
> - u32 format, u64 modifier);
> +bool drm_plane_has_format(struct drm_plane *plane,
> + u32 format, u64 modifier);
> struct drm_mode_rect *
> __drm_plane_get_damage_clips(const struct drm_plane_state *state);
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 57662a1fd345..268aa2299df5 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -877,8 +877,8 @@ int drm_mode_getplane(struct drm_device *dev, void *data,
> return 0;
> }
>
> -int drm_plane_check_pixel_format(struct drm_plane *plane,
> - u32 format, u64 modifier)
> +bool drm_plane_has_format(struct drm_plane *plane,
> + u32 format, u64 modifier)
> {
> unsigned int i;
>
> @@ -887,24 +887,24 @@ int drm_plane_check_pixel_format(struct drm_plane *plane,
> break;
> }
> if (i == plane->format_count)
> - return -EINVAL;
> + return false;
>
> if (plane->funcs->format_mod_supported) {
> if (!plane->funcs->format_mod_supported(plane, format, modifier))
> - return -EINVAL;
> + return false;
> } else {
> if (!plane->modifier_count)
> - return 0;
> + return true;
>
> for (i = 0; i < plane->modifier_count; i++) {
> if (modifier == plane->modifiers[i])
> break;
> }
> if (i == plane->modifier_count)
> - return -EINVAL;
> + return false;
> }
>
> - return 0;
> + return true;
> }
>
> static int __setplane_check(struct drm_plane *plane,
> @@ -924,12 +924,10 @@ static int __setplane_check(struct drm_plane *plane,
> }
>
> /* Check whether this plane supports the fb pixel format. */
> - ret = drm_plane_check_pixel_format(plane, fb->format->format,
> - fb->modifier);
> - if (ret) {
> + if (!drm_plane_has_format(plane, fb->format->format, fb->modifier)) {
> DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n",
> &fb->format->format, fb->modifier);
> - return ret;
> + return -EINVAL;
> }
>
> /* Give drivers some help against integer overflows */
> @@ -964,7 +962,7 @@ bool drm_any_plane_has_format(struct drm_device *dev,
> struct drm_plane *plane;
>
> drm_for_each_plane(plane, dev) {
> - if (drm_plane_check_pixel_format(plane, format, modifier) == 0)
> + if (drm_plane_has_format(plane, format, modifier))
> return true;
> }
--
Jani Nikula, Intel
