]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'mediatek-drm-next-5.13' of https://git.kernel.org/pub/scm/linux/kernel...
authorDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2021 02:41:56 +0000 (12:41 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2021 02:42:14 +0000 (12:42 +1000)
Mediatek DRM Next for Linux 5.13

1. Fine tune the line time for EOTp.
2. Add support mt8192 dpi.
3. Make crtc config-updating atomic.
4. Don't support hdmi connector creation.

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210405082248.3578-1-chunkuang.hu@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
1  2 
MAINTAINERS
drivers/gpu/drm/mediatek/mtk_drm_crtc.c

diff --cc MAINTAINERS
Simple merge
index 54ab3a32475271ec3006f413a67b1c881da2dab4,870f6621084815431fc12313674ea38b94a8e2fc..40df2c8231877e0ce6d098b60ac821fb40fd8605
@@@ -531,8 -538,8 +538,8 @@@ void mtk_drm_crtc_async_update(struct d
        if (!mtk_crtc->enabled)
                return;
  
 -      plane_helper_funcs->atomic_update(plane, new_state);
 +      plane_helper_funcs->atomic_update(plane, state);
-       mtk_drm_crtc_hw_config(mtk_crtc);
+       mtk_drm_crtc_update_config(mtk_crtc, false);
  }
  
  static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,