]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge v5.6-rc5 into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 10 Mar 2020 21:27:21 +0000 (07:27 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Mar 2020 21:27:21 +0000 (07:27 +1000)
Requested my mripard for some misc patches that need this as a base.

Signed-off-by: Dave Airlie <airlied@redhat.com>
26 files changed:
1  2 
Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
MAINTAINERS
arch/arm/configs/omap2plus_defconfig
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
drivers/gpu/drm/amd/powerplay/renoir_ppt.c
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
drivers/gpu/drm/bridge/tc358767.c
drivers/gpu/drm/bridge/ti-tfp410.c
drivers/gpu/drm/drm_client_modeset.c
drivers/gpu/drm/exynos/exynos_drm_dsi.c
drivers/gpu/drm/exynos/exynos_hdmi.c
drivers/gpu/drm/i915/gt/intel_workarounds.c
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/i915_request.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/dsi/dsi_manager.c
drivers/gpu/drm/panfrost/panfrost_job.c
drivers/gpu/drm/panfrost/panfrost_mmu.c
drivers/gpu/drm/ttm/ttm_bo_util.c
drivers/gpu/drm/virtio/virtgpu_object.c
drivers/video/backlight/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index 40c4d4a5517b53e47f0f485c6deb3c64015c6968,f195a4732e0badac04f0864def9999bd1620b575..e3eb6364c0f707d9f6c256c5d4526df581769097
@@@ -147,10 -137,11 +147,11 @@@ static int tfp410_attach(struct drm_bri
                                 &tfp410_con_helper_funcs);
        ret = drm_connector_init_with_ddc(bridge->dev, &dvi->connector,
                                          &tfp410_con_funcs,
 -                                        dvi->connector_type,
 -                                        dvi->ddc);
 +                                        dvi->next_bridge->type,
 +                                        dvi->next_bridge->ddc);
        if (ret) {
-               dev_err(dvi->dev, "drm_connector_init() failed: %d\n", ret);
+               dev_err(dvi->dev, "drm_connector_init_with_ddc() failed: %d\n",
+                       ret);
                return ret;
        }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c5cad949eb8d05f1193b60580482894479120377,3af7ec80c7da7cc0c24173dcec8c9a88a300b616..d2c529a319397acc1231aba2273e767097dced2d
@@@ -123,7 -98,8 +123,8 @@@ struct drm_gem_object *virtio_gpu_creat
        if (!bo)
                return NULL;
  
 -      bo->base.base.funcs = &virtio_gpu_gem_funcs;
 +      bo->base.base.funcs = &virtio_gpu_shmem_funcs;
+       bo->base.map_cached = true;
        return &bo->base.base;
  }
  
Simple merge