projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
imx
/
ipuv3-crtc.c
diff --git
a/drivers/gpu/drm/imx/ipuv3-crtc.c
b/drivers/gpu/drm/imx/ipuv3-crtc.c
index
9cc1d67
..
c436a28
100644
(file)
--- a/
drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/
drivers/gpu/drm/imx/ipuv3-crtc.c
@@
-91,14
+91,14
@@
static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,
ipu_dc_disable(ipu);
ipu_prg_disable(ipu);
ipu_dc_disable(ipu);
ipu_prg_disable(ipu);
+ drm_crtc_vblank_off(crtc);
+
spin_lock_irq(&crtc->dev->event_lock);
spin_lock_irq(&crtc->dev->event_lock);
- if (crtc->state->event) {
+ if (crtc->state->event
&& !crtc->state->active
) {
drm_crtc_send_vblank_event(crtc, crtc->state->event);
crtc->state->event = NULL;
}
spin_unlock_irq(&crtc->dev->event_lock);
drm_crtc_send_vblank_event(crtc, crtc->state->event);
crtc->state->event = NULL;
}
spin_unlock_irq(&crtc->dev->event_lock);
-
- drm_crtc_vblank_off(crtc);
}
static void imx_drm_crtc_reset(struct drm_crtc *crtc)
}
static void imx_drm_crtc_reset(struct drm_crtc *crtc)