mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
drm/omap: cleanup omap_plane_atomic_check()
Clean up omap_plane_atomic_check() with: - Check state->fb first. If no fb, return 0. - use drm_atomic_get_existing_crtc_state() instead of drm_atomic_get_crtc_state() Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
aaf7642e98
commit
70dd2a62aa
1 changed files with 12 additions and 9 deletions
|
@ -157,12 +157,17 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
|
||||||
{
|
{
|
||||||
struct drm_crtc_state *crtc_state;
|
struct drm_crtc_state *crtc_state;
|
||||||
|
|
||||||
if (!state->crtc)
|
if (!state->fb)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
|
/* crtc should only be NULL when disabling (i.e., !state->fb) */
|
||||||
if (IS_ERR(crtc_state))
|
if (WARN_ON(!state->crtc))
|
||||||
return PTR_ERR(crtc_state);
|
return 0;
|
||||||
|
|
||||||
|
crtc_state = drm_atomic_get_existing_crtc_state(state->state, state->crtc);
|
||||||
|
/* we should have a crtc state if the plane is attached to a crtc */
|
||||||
|
if (WARN_ON(!crtc_state))
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!crtc_state->enable)
|
if (!crtc_state->enable)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -176,11 +181,9 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
|
||||||
if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)
|
if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (state->fb) {
|
|
||||||
if (state->rotation != DRM_ROTATE_0 &&
|
if (state->rotation != DRM_ROTATE_0 &&
|
||||||
!omap_framebuffer_supports_rotation(state->fb))
|
!omap_framebuffer_supports_rotation(state->fb))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue