From: Thomas Zimmermann Date: Tue, 11 May 2021 13:59:18 +0000 (+0200) Subject: Merge drm/drm-next into drm-misc-next X-Git-Tag: v5.14-rc1~114^2~25^2~12 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/fd531024bad7e5799e968ca70c0d3ca7b96b71ef Merge drm/drm-next into drm-misc-next Backmerging to get v5.12 fixes. Requested for vmwgfx. Signed-off-by: Thomas Zimmermann --- fd531024bad7e5799e968ca70c0d3ca7b96b71ef diff --cc drivers/gpu/drm/tegra/drm.c index b2dc3c6fefcb,0c350b0daab4..f96c237b2242 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@@ -1122,10 -1121,11 +1122,9 @@@ static int host1x_drm_probe(struct host drm->mode_config.min_width = 0; drm->mode_config.min_height = 0; - - drm->mode_config.max_width = 4096; - drm->mode_config.max_height = 4096; + drm->mode_config.max_width = 0; + drm->mode_config.max_height = 0; - drm->mode_config.allow_fb_modifiers = true; - drm->mode_config.normalize_zpos = true; drm->mode_config.funcs = &tegra_drm_mode_config_funcs; diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index e9ea97168288,399f70d340eb..7805ba0e1c49 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@@ -724,8 -715,16 +715,16 @@@ static int vmw_driver_load(struct vmw_p spin_lock_init(&dev_priv->cap_lock); spin_lock_init(&dev_priv->cursor_lock); + ret = vmw_setup_pci_resources(dev_priv, pci_id); + if (ret) + return ret; + ret = vmw_detect_version(dev_priv); + if (ret) + goto out_no_pci_or_version; + + for (i = vmw_res_context; i < vmw_res_max; ++i) { - idr_init(&dev_priv->res_idr[i]); + idr_init_base(&dev_priv->res_idr[i], 1); INIT_LIST_HEAD(&dev_priv->res_lru[i]); }