vgaarb: don't pass a cookie to vga_client_register

The VGA arbitration is entirely based on pci_dev structures, so just pass
that back to the set_vga_decode callback.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-8-hch@lst.de
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3c817f7e9ae8402f908ebc62cf3738239f30eb5f..45c84e4413cb5fb5a9d8149dd98e9f30352b8992 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1266,15 +1266,16 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev)
 /**
  * amdgpu_device_vga_set_decode - enable/disable vga decode
  *
- * @cookie: amdgpu_device pointer
+ * @pdev: PCI device pointer
  * @state: enable/disable vga decode
  *
  * Enable/disable vga decode (all asics).
  * Returns VGA resource flags.
  */
-static unsigned int amdgpu_device_vga_set_decode(void *cookie, bool state)
+static unsigned int amdgpu_device_vga_set_decode(struct pci_dev *pdev,
+               bool state)
 {
-       struct amdgpu_device *adev = cookie;
+       struct amdgpu_device *adev = drm_to_adev(pci_get_drvdata(pdev));
        amdgpu_asic_set_vga_state(adev, state);
        if (state)
                return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
@@ -3679,7 +3680,7 @@ fence_driver_init:
        /* this will fail for cards that aren't VGA class devices, just
         * ignore it */
        if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
-               vga_client_register(adev->pdev, adev, amdgpu_device_vga_set_decode);
+               vga_client_register(adev->pdev, amdgpu_device_vga_set_decode);
 
        if (amdgpu_device_supports_px(ddev)) {
                px = true;

diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 0222719e0824cac00330819ab0251d00d41dac98..16c25070098510f0122db3453f505b5f4bb3e692 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -121,9 +121,9 @@ intel_vga_set_state(struct drm_i915_private *i915, bool enable_decode)
 }
 
 static unsigned int
-intel_vga_set_decode(void *cookie, bool enable_decode)
+intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
 {
-       struct drm_i915_private *i915 = cookie;
+       struct drm_i915_private *i915 = pdev_to_i915(pdev);
 
        intel_vga_set_state(i915, enable_decode);
 
@@ -136,6 +136,7 @@ intel_vga_set_decode(void *cookie, bool enable_decode)
 
 int intel_vga_register(struct drm_i915_private *i915)
 {
+
        struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
        int ret;
 
@@ -147,7 +148,7 @@ int intel_vga_register(struct drm_i915_private *i915)
         * then we do not take part in VGA arbitration and the
         * vga_client_register() fails with -ENODEV.
         */
-       ret = vga_client_register(pdev, i915, intel_vga_set_decode);
+       ret = vga_client_register(pdev, intel_vga_set_decode);
        if (ret && ret != -ENODEV)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
index d071c11249a3038181d733f29d650a4acbf8af89..60cd8c0463dff377e6971a9f46b07340ac08d6ec 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -11,9 +11,9 @@
 #include "nouveau_vga.h"
 
 static unsigned int
-nouveau_vga_set_decode(void *priv, bool state)
+nouveau_vga_set_decode(struct pci_dev *pdev, bool state)
 {
-       struct nouveau_drm *drm = nouveau_drm(priv);
+       struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
        struct nvif_object *device = &drm->client.device.object;
 
        if (drm->client.device.info.family == NV_DEVICE_INFO_V0_CURIE &&
@@ -94,7 +94,7 @@ nouveau_vga_init(struct nouveau_drm *drm)
                return;
        pdev = to_pci_dev(dev->dev);
 
-       vga_client_register(pdev, dev, nouveau_vga_set_decode);
+       vga_client_register(pdev, nouveau_vga_set_decode);
 
        /* don't register Thunderbolt eGPU with vga_switcheroo */
        if (pci_is_thunderbolt_attached(pdev))

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 11e8e42d99b3e9c43351bc6111eaaaef20cc3d6c..cec03238e14d6e1e5eb936c84b0ea2bb8449b958 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1067,15 +1067,16 @@ void radeon_combios_fini(struct radeon_device *rdev)
 /**
  * radeon_vga_set_decode - enable/disable vga decode
  *
- * @cookie: radeon_device pointer
+ * @pdev: PCI device
  * @state: enable/disable vga decode
  *
  * Enable/disable vga decode (all asics).
  * Returns VGA resource flags.
  */
-static unsigned int radeon_vga_set_decode(void *cookie, bool state)
+static unsigned int radeon_vga_set_decode(struct pci_dev *pdev, bool state)
 {
-       struct radeon_device *rdev = cookie;
+       struct drm_device *dev = pci_get_drvdata(pdev);
+       struct radeon_device *rdev = dev->dev_private;
        radeon_vga_set_state(rdev, state);
        if (state)
                return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
@@ -1434,7 +1435,7 @@ int radeon_device_init(struct radeon_device *rdev,
        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
        /* this will fail for cards that aren't VGA class devices, just
         * ignore it */
-       vga_client_register(rdev->pdev, rdev, radeon_vga_set_decode);
+       vga_client_register(rdev->pdev, radeon_vga_set_decode);
 
        if (rdev->flags & RADEON_IS_PX)
                runtime = true;

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 4bde017f6f22ffda8b830b1d21cc894a3862377d..569930552957b518fa26ff4ee9251baadfd235f0 100644 (file)
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -72,8 +72,7 @@ struct vga_device {
        unsigned int io_norm_cnt;       /* normal IO count */
        unsigned int mem_norm_cnt;      /* normal MEM count */
        bool bridge_has_one_vga;
-       void *cookie;
-       unsigned int (*set_vga_decode)(void *cookie, bool decode);
+       unsigned int (*set_decode)(struct pci_dev *pdev, bool decode);
 };
 
 static LIST_HEAD(vga_list);
@@ -806,7 +805,7 @@ static void __vga_set_legacy_decoding(struct pci_dev *pdev,
                goto bail;
 
        /* don't let userspace futz with kernel driver decodes */
-       if (userspace && vgadev->set_vga_decode)
+       if (userspace && vgadev->set_decode)
                goto bail;
 
        /* update the device decodes + counter */
@@ -840,12 +839,11 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);
 /**
  * vga_client_register - register or unregister a VGA arbitration client
  * @pdev: pci device of the VGA client
- * @cookie: client cookie to be used in callbacks
- * @set_vga_decode: vga decode change callback
+ * @set_decode: vga decode change callback
  *
  * Clients have two callback mechanisms they can use.
  *
- * @set_vga_decode callback: If a client can disable its GPU VGA resource, it
+ * @set_decode callback: If a client can disable its GPU VGA resource, it
  * will get a callback from this to set the encode/decode state.
  *
  * Rationale: we cannot disable VGA decode resources unconditionally some single
@@ -862,9 +860,8 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);
  *
  * Returns: 0 on success, -1 on failure
  */
-int vga_client_register(struct pci_dev *pdev, void *cookie,
-                       unsigned int (*set_vga_decode)(void *cookie,
-                                                      bool decode))
+int vga_client_register(struct pci_dev *pdev,
+               unsigned int (*set_decode)(struct pci_dev *pdev, bool decode))
 {
        int ret = -ENODEV;
        struct vga_device *vgadev;
@@ -875,8 +872,7 @@ int vga_client_register(struct pci_dev *pdev, void *cookie,
        if (!vgadev)
                goto bail;
 
-       vgadev->set_vga_decode = set_vga_decode;
-       vgadev->cookie = cookie;
+       vgadev->set_decode = set_decode;
        ret = 0;
 
 bail:
@@ -1386,9 +1382,9 @@ static void vga_arbiter_notify_clients(void)
                        new_state = false;
                else
                        new_state = true;
-               if (vgadev->set_vga_decode) {
-                       new_decodes = vgadev->set_vga_decode(vgadev->cookie,
-                                                            new_state);
+               if (vgadev->set_decode) {
+                       new_decodes = vgadev->set_decode(vgadev->pdev,
+                                                        new_state);
                        vga_update_device_decodes(vgadev, new_decodes);
                }
        }

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index b038900fee48b91e9ff07bcdfe3ef92791aabc94..2a52244196db8d11fc5524db76857d13ae421603 100644 (file)
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -119,10 +119,9 @@ static bool vfio_pci_is_denylisted(struct pci_dev *pdev)
  * has no way to get to it and routing can be disabled externally at the
  * bridge.
  */
-static unsigned int vfio_pci_set_vga_decode(void *opaque, bool single_vga)
+static unsigned int vfio_pci_set_decode(struct pci_dev *pdev, bool single_vga)
 {
-       struct vfio_pci_device *vdev = opaque;
-       struct pci_dev *tmp = NULL, *pdev = vdev->pdev;
+       struct pci_dev *tmp = NULL;
        unsigned char max_busnr;
        unsigned int decodes;
 
@@ -1951,10 +1950,10 @@ static int vfio_pci_vga_init(struct vfio_pci_device *vdev)
        if (!vfio_pci_is_vga(pdev))
                return 0;
 
-       ret = vga_client_register(pdev, vdev, vfio_pci_set_vga_decode);
+       ret = vga_client_register(pdev, vfio_pci_set_decode);
        if (ret)
                return ret;
-       vga_set_legacy_decoding(pdev, vfio_pci_set_vga_decode(vdev, false));
+       vga_set_legacy_decoding(pdev, vfio_pci_set_decode(pdev, false));
        return 0;
 }
 

diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index ea45d3e86fff328dcec0c06c4b7eefb684e0b611..b4b9137f97923d2e429efc3bdbc57d6463ec3543 100644 (file)
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -51,8 +51,8 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc);
 struct pci_dev *vga_default_device(void);
 void vga_set_default_device(struct pci_dev *pdev);
 int vga_remove_vgacon(struct pci_dev *pdev);
-int vga_client_register(struct pci_dev *pdev, void *cookie,
-                       unsigned int (*set_vga_decode)(void *cookie, bool state));
+int vga_client_register(struct pci_dev *pdev,
+               unsigned int (*set_decode)(struct pci_dev *pdev, bool state));
 #else /* CONFIG_VGA_ARB */
 static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
                unsigned int decodes)
@@ -77,8 +77,8 @@ static inline int vga_remove_vgacon(struct pci_dev *pdev)
 {
        return 0;
 }
-static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
-                                     unsigned int (*set_vga_decode)(void *cookie, bool state))
+static inline int vga_client_register(struct pci_dev *pdev,
+               unsigned int (*set_decode)(struct pci_dev *pdev, bool state))
 {
        return 0;
 }
@@ -116,7 +116,7 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,
 
 static inline void vga_client_unregister(struct pci_dev *pdev)
 {
-       vga_client_register(pdev, NULL, NULL);
+       vga_client_register(pdev, NULL);
 }
 
 #endif /* LINUX_VGA_H */