diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-10-21 22:34:54 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-10-21 22:35:28 +0300 |
| commit | 7e1c5440f4f9b4db5cb2482c347fa3d74bf50440 (patch) | |
| tree | 3355e42d1c7f5780f4980d83de79adef0cc3fc3f /drivers/gpu/drm/kmb/kmb_dsi.h | |
| parent | 730b64d827c309f43bc6a91134e3551f25599cbc (diff) | |
| parent | 74056092ff415e7e20ce2544689b32ee811c4f0b (diff) | |
| download | linux-7e1c5440f4f9b4db5cb2482c347fa3d74bf50440.tar.xz | |
Merge tag 'drm-misc-fixes-2021-10-21-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.15-rc7:
- Rebased, to remove vc4 patches.
- Fix mxsfb crash on unload.
- Use correct sync parameters for Feixin K101-IM2BYL02.
- Assorted kmb modeset/atomic fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e66eaf89-b9b9-41f5-d0d2-dad7e59fabb5@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/kmb/kmb_dsi.h')
| -rw-r--r-- | drivers/gpu/drm/kmb/kmb_dsi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/kmb/kmb_dsi.h b/drivers/gpu/drm/kmb/kmb_dsi.h index 66b7c500d9bc..09dc88743d77 100644 --- a/drivers/gpu/drm/kmb/kmb_dsi.h +++ b/drivers/gpu/drm/kmb/kmb_dsi.h @@ -380,7 +380,7 @@ int kmb_dsi_host_bridge_init(struct device *dev); struct kmb_dsi *kmb_dsi_init(struct platform_device *pdev); void kmb_dsi_host_unregister(struct kmb_dsi *kmb_dsi); int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode, - int sys_clk_mhz); + int sys_clk_mhz, struct drm_atomic_state *old_state); int kmb_dsi_map_mmio(struct kmb_dsi *kmb_dsi); int kmb_dsi_clk_init(struct kmb_dsi *kmb_dsi); int kmb_dsi_encoder_init(struct drm_device *dev, struct kmb_dsi *kmb_dsi); |