public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/ssd130x: Fix atomic_check for disabled planes

Browse source 
The plane's atomic_check returns -EINVAL if the CRTC has not been
set. This is the case for disabled planes, for which atomic_check
should return 0. For disabled planes, it also omits the mandatory
call to drm_atomic_helper_check_plane_state().

Replace the test with the boiler-plate code that first invokes
drm_atomic_helper_check_plane_state() and then tests for the plane
to be visible. Return early for non-visible planes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: d51f9fbd98 ("drm/ssd130x: Store the HW buffer in the driver-private CRTC state")
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Tested-by: Javier Martinez Canillas <javierm@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009141018.11291-7-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-10-09 16:06:35 +02:00 • committed by Javier Martinez Canillas
parent e755d439c1
commit a48e2cc928
No known key found for this signature in database
GPG key ID: C751E590D63F3D69
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/solomon/ssd130x.c
View file

@ -638,21 +638,22 @@ static int ssd130x_primary_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane); struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
struct ssd130x_plane_state *ssd130x_state = to_ssd130x_plane_state(plane_state); struct ssd130x_plane_state *ssd130x_state = to_ssd130x_plane_state(plane_state);
struct drm_crtc *crtc = plane_state->crtc; struct drm_crtc *crtc = plane_state->crtc;
struct drm_crtc_state *crtc_state; struct drm_crtc_state *crtc_state = NULL;
const struct drm_format_info *fi; const struct drm_format_info *fi;
unsigned int pitch; unsigned int pitch;
int ret; int ret;
if (!crtc) if (crtc)
return -EINVAL; crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
crtc_state = drm_atomic_get_crtc_state(state, crtc); ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
if (IS_ERR(crtc_state)) DRM_PLANE_NO_SCALING,
return PTR_ERR(crtc_state); DRM_PLANE_NO_SCALING,
false, false);
ret = drm_plane_helper_atomic_check(plane, state);
if (ret) if (ret)
return ret; return ret;
else if (!plane_state->visible)
return 0;
fi = drm_format_info(DRM_FORMAT_R1); fi = drm_format_info(DRM_FORMAT_R1);
if (!fi) if (!fi)