| Message ID | 1473946905-4374-3-git-send-email-fabien.dessenne@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Acked-by: Vincent Abriou <vincent.abriou@st.com> On 09/15/2016 03:41 PM, Fabien Dessenne wrote: > Do not rely on plane->status to define whether this is the first update > but rather check for hqvdp->xp70_initialized bit status. > This avoids multiple and unwanted calls to sti_vtg_register_client() > which breaks the kernel scheduler. > > Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> > --- > drivers/gpu/drm/sti/sti_hqvdp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c > index b5ee783..a222b2e 100644 > --- a/drivers/gpu/drm/sti/sti_hqvdp.c > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c > @@ -770,6 +770,7 @@ static void sti_hqvdp_disable(struct sti_hqvdp *hqvdp) > DRM_ERROR("XP70 could not revert to idle\n"); > > hqvdp->plane.status = STI_PLANE_DISABLED; > + hqvdp->xp70_initialized = false; > } > > /** > @@ -1012,7 +1013,6 @@ static int sti_hqvdp_atomic_check(struct drm_plane *drm_plane, > struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane); > struct drm_crtc *crtc = state->crtc; > struct drm_framebuffer *fb = state->fb; > - bool first_prepare = plane->status == STI_PLANE_DISABLED ? true : false; > struct drm_crtc_state *crtc_state; > struct drm_display_mode *mode; > int dst_x, dst_y, dst_w, dst_h; > @@ -1063,7 +1063,7 @@ static int sti_hqvdp_atomic_check(struct drm_plane *drm_plane, > return -EINVAL; > } > > - if (first_prepare) { > + if (!hqvdp->xp70_initialized) { > /* Start HQVDP XP70 coprocessor */ > sti_hqvdp_start_xp70(hqvdp); > >
diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index b5ee783..a222b2e 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c @@ -770,6 +770,7 @@ static void sti_hqvdp_disable(struct sti_hqvdp *hqvdp) DRM_ERROR("XP70 could not revert to idle\n"); hqvdp->plane.status = STI_PLANE_DISABLED; + hqvdp->xp70_initialized = false; } /** @@ -1012,7 +1013,6 @@ static int sti_hqvdp_atomic_check(struct drm_plane *drm_plane, struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane); struct drm_crtc *crtc = state->crtc; struct drm_framebuffer *fb = state->fb; - bool first_prepare = plane->status == STI_PLANE_DISABLED ? true : false; struct drm_crtc_state *crtc_state; struct drm_display_mode *mode; int dst_x, dst_y, dst_w, dst_h; @@ -1063,7 +1063,7 @@ static int sti_hqvdp_atomic_check(struct drm_plane *drm_plane, return -EINVAL; } - if (first_prepare) { + if (!hqvdp->xp70_initialized) { /* Start HQVDP XP70 coprocessor */ sti_hqvdp_start_xp70(hqvdp);
Do not rely on plane->status to define whether this is the first update but rather check for hqvdp->xp70_initialized bit status. This avoids multiple and unwanted calls to sti_vtg_register_client() which breaks the kernel scheduler. Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> --- drivers/gpu/drm/sti/sti_hqvdp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)