Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

vgaarb: don't pass a cookie to vga_client_register

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2021-07-16 08:16:34 +02:00 committed by Christian König
parent f6b1772b25
commit bf44e8cecc
7 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@ -1266,15 +1266,16 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev)
/** /**
* amdgpu_device_vga_set_decode - enable/disable vga decode * amdgpu_device_vga_set_decode - enable/disable vga decode
* *
* @cookie: amdgpu_device pointer * @pdev: PCI device pointer
* @state: enable/disable vga decode * @state: enable/disable vga decode
* *
* Enable/disable vga decode (all asics). * Enable/disable vga decode (all asics).
* Returns VGA resource flags. * 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); amdgpu_asic_set_vga_state(adev, state);
if (state) if (state)
return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM | 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 /* this will fail for cards that aren't VGA class devices, just
* ignore it */ * ignore it */
if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) 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)) { if (amdgpu_device_supports_px(ddev)) {
px = true; px = true;

7
drivers/gpu/drm/i915/display/intel_vga.c
View File

@ -121,9 +121,9 @@ intel_vga_set_state(struct drm_i915_private *i915, bool enable_decode)
} }
static unsigned int 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); 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) int intel_vga_register(struct drm_i915_private *i915)
{ {
struct pci_dev *pdev = to_pci_dev(i915->drm.dev); struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
int ret; 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 * then we do not take part in VGA arbitration and the
* vga_client_register() fails with -ENODEV. * 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) if (ret && ret != -ENODEV)
return ret; return ret;

6
drivers/gpu/drm/nouveau/nouveau_vga.c
View File

@ -11,9 +11,9 @@
#include "nouveau_vga.h" #include "nouveau_vga.h"
static unsigned int 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; struct nvif_object *device = &drm->client.device.object;
if (drm->client.device.info.family == NV_DEVICE_INFO_V0_CURIE && if (drm->client.device.info.family == NV_DEVICE_INFO_V0_CURIE &&
@ -94,7 +94,7 @@ nouveau_vga_init(struct nouveau_drm *drm)
return; return;
pdev = to_pci_dev(dev->dev); 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 */ /* don't register Thunderbolt eGPU with vga_switcheroo */
if (pci_is_thunderbolt_attached(pdev)) if (pci_is_thunderbolt_attached(pdev))

9
drivers/gpu/drm/radeon/radeon_device.c
View File

@ -1067,15 +1067,16 @@ void radeon_combios_fini(struct radeon_device *rdev)
/** /**
* radeon_vga_set_decode - enable/disable vga decode * radeon_vga_set_decode - enable/disable vga decode
* *
* @cookie: radeon_device pointer * @pdev: PCI device
* @state: enable/disable vga decode * @state: enable/disable vga decode
* *
* Enable/disable vga decode (all asics). * Enable/disable vga decode (all asics).
* Returns VGA resource flags. * 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); radeon_vga_set_state(rdev, state);
if (state) if (state)
return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM | 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 */ /* if we have > 1 VGA cards, then disable the radeon VGA resources */
/* this will fail for cards that aren't VGA class devices, just /* this will fail for cards that aren't VGA class devices, just
* ignore it */ * 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) if (rdev->flags & RADEON_IS_PX)
runtime = true; runtime = true;

24
drivers/gpu/vga/vgaarb.c
View File

@ -72,8 +72,7 @@ struct vga_device {
unsigned int io_norm_cnt; /* normal IO count */ unsigned int io_norm_cnt; /* normal IO count */
unsigned int mem_norm_cnt; /* normal MEM count */ unsigned int mem_norm_cnt; /* normal MEM count */
bool bridge_has_one_vga; bool bridge_has_one_vga;
void *cookie; unsigned int (*set_decode)(struct pci_dev *pdev, bool decode);
unsigned int (*set_vga_decode)(void *cookie, bool decode);
}; };
static LIST_HEAD(vga_list); static LIST_HEAD(vga_list);
@ -806,7 +805,7 @@ static void __vga_set_legacy_decoding(struct pci_dev *pdev,
goto bail; goto bail;
/* don't let userspace futz with kernel driver decodes */ /* don't let userspace futz with kernel driver decodes */
if (userspace && vgadev->set_vga_decode) if (userspace && vgadev->set_decode)
goto bail; goto bail;
/* update the device decodes + counter */ /* 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 * vga_client_register - register or unregister a VGA arbitration client
* @pdev: pci device of the VGA client * @pdev: pci device of the VGA client
* @cookie: client cookie to be used in callbacks * @set_decode: vga decode change callback
* @set_vga_decode: vga decode change callback
* *
* Clients have two callback mechanisms they can use. * 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. * will get a callback from this to set the encode/decode state.
* *
* Rationale: we cannot disable VGA decode resources unconditionally some single * 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 * Returns: 0 on success, -1 on failure
*/ */
int vga_client_register(struct pci_dev *pdev, void *cookie, int vga_client_register(struct pci_dev *pdev,
unsigned int (*set_vga_decode)(void *cookie, unsigned int (*set_decode)(struct pci_dev *pdev, bool decode))
bool decode))
{ {
int ret = -ENODEV; int ret = -ENODEV;
struct vga_device *vgadev; struct vga_device *vgadev;
@ -875,8 +872,7 @@ int vga_client_register(struct pci_dev *pdev, void *cookie,
if (!vgadev) if (!vgadev)
goto bail; goto bail;
vgadev->set_vga_decode = set_vga_decode; vgadev->set_decode = set_decode;
vgadev->cookie = cookie;
ret = 0; ret = 0;
bail: bail:
@ -1386,9 +1382,9 @@ static void vga_arbiter_notify_clients(void)
new_state = false; new_state = false;
else else
new_state = true; new_state = true;
if (vgadev->set_vga_decode) { if (vgadev->set_decode) {
new_decodes = vgadev->set_vga_decode(vgadev->cookie, new_decodes = vgadev->set_decode(vgadev->pdev,
new_state); new_state);
vga_update_device_decodes(vgadev, new_decodes); vga_update_device_decodes(vgadev, new_decodes);
} }
} }

9
drivers/vfio/pci/vfio_pci.c
View File

@ -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 * has no way to get to it and routing can be disabled externally at the
* bridge. * 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;
struct pci_dev *tmp = NULL, *pdev = vdev->pdev;
unsigned char max_busnr; unsigned char max_busnr;
unsigned int decodes; unsigned int decodes;
@ -1951,10 +1950,10 @@ static int vfio_pci_vga_init(struct vfio_pci_device *vdev)
if (!vfio_pci_is_vga(pdev)) if (!vfio_pci_is_vga(pdev))
return 0; return 0;
ret = vga_client_register(pdev, vdev, vfio_pci_set_vga_decode); ret = vga_client_register(pdev, vfio_pci_set_decode);
if (ret) if (ret)
return 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; return 0;
} }

10
include/linux/vgaarb.h
View File

@ -51,8 +51,8 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc);
struct pci_dev *vga_default_device(void); struct pci_dev *vga_default_device(void);
void vga_set_default_device(struct pci_dev *pdev); void vga_set_default_device(struct pci_dev *pdev);
int vga_remove_vgacon(struct pci_dev *pdev); int vga_remove_vgacon(struct pci_dev *pdev);
int vga_client_register(struct pci_dev *pdev, void *cookie, int vga_client_register(struct pci_dev *pdev,
unsigned int (*set_vga_decode)(void *cookie, bool state)); unsigned int (*set_decode)(struct pci_dev *pdev, bool state));
#else /* CONFIG_VGA_ARB */ #else /* CONFIG_VGA_ARB */
static inline void vga_set_legacy_decoding(struct pci_dev *pdev, static inline void vga_set_legacy_decoding(struct pci_dev *pdev,
unsigned int decodes) unsigned int decodes)
@ -77,8 +77,8 @@ static inline int vga_remove_vgacon(struct pci_dev *pdev)
{ {
return 0; return 0;
} }
static inline int vga_client_register(struct pci_dev *pdev, void *cookie, static inline int vga_client_register(struct pci_dev *pdev,
unsigned int (*set_vga_decode)(void *cookie, bool state)) unsigned int (*set_decode)(struct pci_dev *pdev, bool state))
{ {
return 0; 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) 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 */ #endif /* LINUX_VGA_H */