diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-10-04 09:29:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-10-04 09:29:25 +1000 |
| commit | 4ae9f874dc1d662ce7bfdb8144903608bcc3706b (patch) | |
| tree | 41d2469025795144c2178af56ac0f6149f2d517b /drivers/gpu/drm/meson/meson_encoder_cvbs.h | |
| parent | 7860d720a84c74b2761c6b7995392a798ab0a3cb (diff) | |
| parent | c9b48b91e2fbb74fb981aa616a6ef3c78194077f (diff) | |
Merge tag 'drm-misc-next-2022-09-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.1:
Core Changes:
- Add dma_resv_assert_held to vmap/vunmap calls.
- Add kunit tests for some format conversion calls.
- Don't rewrite link config when setting phy test pattern in
DP link training.
Driver Changes:
- Assorted small fixes in bridge/lt8192b, qxl, virtio-gpu, ast.
- Fix corrupted image output in lt8912b.
- Fix driver unbind in meson.
- Add INX, BOE, AUO, Multi-Inno Technology panels to panel-edp.
- Synchronize access to GEM bo's in simpledrm, ssd130x.
- Use dev_err_probe in panel-edp and panel-simple.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/afbd505a-3799-c73b-8008-ef6e156ad7e1@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/meson/meson_encoder_cvbs.h')
| -rw-r--r-- | drivers/gpu/drm/meson/meson_encoder_cvbs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.h b/drivers/gpu/drm/meson/meson_encoder_cvbs.h index 61d9d183ce7f..09710fec3c66 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.h +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.h @@ -25,5 +25,6 @@ struct meson_cvbs_mode { extern struct meson_cvbs_mode meson_cvbs_modes[MESON_CVBS_MODES_COUNT]; int meson_encoder_cvbs_init(struct meson_drm *priv); +void meson_encoder_cvbs_remove(struct meson_drm *priv); #endif /* __MESON_VENC_CVBS_H */ |