diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-16 16:45:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-16 17:08:46 +1000 |
| commit | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (patch) | |
| tree | 3257e3e0fda7fbb0fe1425177b0c661db1bfee63 /drivers/video/fbdev/omap2/omapfb/dss/dsi.c | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| parent | 762949bb1da78941b25e63f7e952af037eee15a9 (diff) | |
| download | linux-51c3b916a4d7e24b4918925965867fdd9bd8dd59.tar.gz | |
Merge tag 'drm-misc-next-2021-03-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.13:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- %p4cc printk format modifier
- atomic: introduce drm_crtc_commit_wait, rework atomic plane state
helpers to take the drm_commit_state structure
- dma-buf: heaps rework to return a struct dma_buf
- simple-kms: Add plate state helpers
- ttm: debugfs support, removal of sysfs
Driver Changes:
- Convert drivers to shadow plane helpers
- arc: Move to drm/tiny
- ast: cursor plane reworks
- gma500: Remove TTM and medfield support
- mxsfb: imx8mm support
- panfrost: MMU IRQ handling rework
- qxl: rework to better handle resources deallocation, locking
- sun4i: Add alpha properties for UI and VI layers
- vc4: RPi4 CEC support
- vmwgfx: doc cleanup
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210303100600.dgnkadonzuvfnu22@gilmour
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/dss/dsi.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c index daa313f14335..d43b081d592f 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c @@ -2376,8 +2376,6 @@ static int dsi_sync_vc(struct platform_device *dsidev, int channel) WARN_ON(!dsi_bus_is_locked(dsidev)); - WARN_ON(in_interrupt()); - if (!dsi_vc_is_enabled(dsidev, channel)) return 0; |