From: Dave Airlie Date: Tue, 10 Mar 2020 21:27:21 +0000 (+1000) Subject: Merge v5.6-rc5 into drm-next X-Git-Tag: libata-5.7-2020-04-09~30^2~16 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d3bd37f587b4438d47751d0f1d5aaae3d39bd416;p=linux-block.git Merge v5.6-rc5 into drm-next Requested my mripard for some misc patches that need this as a base. Signed-off-by: Dave Airlie --- d3bd37f587b4438d47751d0f1d5aaae3d39bd416 diff --cc drivers/gpu/drm/bridge/ti-tfp410.c index 40c4d4a5517b,f195a4732e0b..e3eb6364c0f7 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@@ -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; } diff --cc drivers/gpu/drm/virtio/virtgpu_object.c index c5cad949eb8d,3af7ec80c7da..d2c529a31939 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@@ -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; }