Commit 68ce556b authored by Zack Rusin's avatar Zack Rusin
Browse files

drm/vmwgfx: Fix the lockdep breakage 



Thomas has noticed that the lockdep was broken in vmwgfx. It
was broken during the pci initialization rework. This fixes
the breakage by making sure we initialize the locking code
before doing anything else. This was independently spotted
and fixed by Tetsuo Handa as well.

Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Reviewed-by: default avatarRoland Scheidegger <sroland@vmware.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Fixes: 8772c0bb ("drm/vmwgfx: Cleanup pci resource allocation")
Link: https://patchwork.freedesktop.org/patch/msgid/20210408172245.673785-1-zackr@vmware.com
parent ab4d9913

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+8 −9
Original line number Diff line number Diff line
@@ -712,17 +712,8 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
	dev_priv->last_read_seqno = (uint32_t) -100;

	dev_priv->drm.dev_private = dev_priv;



	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;



	mutex_init(&dev_priv->cmdbuf_mutex);

	mutex_init(&dev_priv->release_mutex);

	mutex_init(&dev_priv->binding_mutex);

	mutex_init(&dev_priv->global_kms_state_mutex);

	ttm_lock_init(&dev_priv->reservation_sem);

	spin_lock_init(&dev_priv->resource_lock);

	spin_lock_init(&dev_priv->hw_lock);
@@ -730,6 +721,14 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
	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]);

		INIT_LIST_HEAD(&dev_priv->res_lru[i]);

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ struct vmw_private { 
	struct vmw_overlay *overlay_priv;

	struct drm_property *hotplug_mode_update_property;

	struct drm_property *implicit_placement_property;

	struct mutex global_kms_state_mutex;

	spinlock_t cursor_lock;

	struct drm_atomic_state *suspend_state;
@@ -592,7 +591,6 @@ struct vmw_private { 
	bool refuse_hibernation;

	bool suspend_locked;



	struct mutex release_mutex;

	atomic_t num_fifo_resources;



	/*