drm/vmwgfx: Remove vmw_chipset

vmw_chipset was duplicating pci_id. They are exactly the same
variable just with two different names. Becuase pci_id was
already used to detect the SVGA version, there's no point
in having vmw_chipset and thus we can remove it.

All references to vmw_chipset should use pci_id.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Martin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210609172307.131929-9-zackr@vmware.com

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index be3db49..d51f215 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -706,7 +706,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
 }
 
 static int vmw_setup_pci_resources(struct vmw_private *dev,
-                                  unsigned long pci_id)
+                                  u32 pci_id)
 {
        resource_size_t rmmio_start;
        resource_size_t rmmio_size;
@@ -783,7 +783,7 @@ static int vmw_detect_version(struct vmw_private *dev)
        svga_id = vmw_read(dev, SVGA_REG_ID);
        if (svga_id != SVGA_ID_2 && svga_id != SVGA_ID_3) {
                DRM_ERROR("Unsupported SVGA ID 0x%x on chipset 0x%x\n",
-                         svga_id, dev->vmw_chipset);
+                         svga_id, dev->pci_id);
                return -ENOSYS;
        }
        BUG_ON(vmw_is_svga_v3(dev) && (svga_id != SVGA_ID_3));
@@ -798,7 +798,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id)
        bool refuse_dma = false;
        struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
 
-       dev_priv->vmw_chipset = pci_id;
        dev_priv->drm.dev_private = dev_priv;
 
        mutex_init(&dev_priv->cmdbuf_mutex);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 3875cfb..9422967 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -487,8 +487,7 @@ struct vmw_private {
        struct ttm_device bdev;
 
        struct drm_vma_offset_manager vma_manager;
-       unsigned long pci_id;
-       u32 vmw_chipset;
+       u32 pci_id;
        resource_size_t io_start;
        resource_size_t vram_start;
        resource_size_t vram_size;