Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 7 Feb 2022 16:01:37 +0000 (17:01 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 7 Feb 2022 16:03:24 +0000 (17:03 +0100)
First backmerge into drm-misc-next. Required for more helpers backmerged,
and to pull in 5.17 (rc2).

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
1  2 
Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/mediatek/mtk_drm_drv.c
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/tegra/drm.c
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -512,15 -507,11 +507,14 @@@ static int msm_init_vram(struct drm_dev
  static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
  {
        struct platform_device *pdev = to_platform_device(dev);
+       struct msm_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *ddev;
-       struct msm_drm_private *priv;
        struct msm_kms *kms;
-       struct msm_mdss *mdss;
        int ret, i;
  
 +      if (drm_firmware_drivers_only())
 +              return -ENODEV;
 +
        ddev = drm_dev_alloc(drv, dev);
        if (IS_ERR(ddev)) {
                DRM_DEV_ERROR(dev, "failed to allocate drm_device\n");
Simple merge
Simple merge