diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
| commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
| tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /drivers/gpu/drm/omapdrm | |
| parent | 3393649977f9a8847c659e282ea290d4b703295c (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
| download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.bz2 | |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index 0fa8f677b647..5c027c81760f 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -597,7 +597,7 @@ static void venc_bridge_mode_set(struct drm_bridge *bridge, switch (venc_mode) { default: WARN_ON_ONCE(1); - /* Fall-through */ + fallthrough; case VENC_MODE_PAL: venc->config = &venc_config_pal_trm; break; diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 6d40914675da..328a4a74f534 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -451,11 +451,12 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc, if (omap_state->manually_updated) return; - spin_lock_irq(&crtc->dev->event_lock); drm_crtc_vblank_on(crtc); + ret = drm_crtc_vblank_get(crtc); WARN_ON(ret != 0); + spin_lock_irq(&crtc->dev->event_lock); omap_crtc_arm_event(crtc); spin_unlock_irq(&crtc->dev->event_lock); } |