PCI/VGA: Improve the default VGA device selection
Subsystems (13)
v3 cover PCI/VGA: Improve the default VGA device selection
From: Sui Jingfeng <[email protected]>
Currently, the default VGA device selection is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device on a multiple video card coexistence system. But this is still a policy because it doesn't give the user a choice to override.
With the observation that device drivers or video aperture helpers may have better knowledge about which PCI bar contains the firmware FB,
This patch tries to solve the above problems by introducing a function callback to the vga_client_register() function interface. DRM device drivers for the PCI device need to register the is_boot_device() function callback during the driver loading time. Once the driver binds the device successfully, VRAARB will call back to the driver. This gives the device drivers a chance to provide accurate boot device identification. Which in turn unlock the abitration service to non-x86 architectures. A device driver can also pass a NULL pointer to keep the original behavior.
This series is applied on the drm-tip branch (with a cleanup patch set[1] applied beforehand)
[1] https://patchwork.freedesktop.org/series/120548/
v2:
* Add a simple implemment for drm/i915 and drm/ast
* Pick up all tags (Mario)
v3:
* Fix a mistake for drm/i915 implement
* Fix patch can not be applied problem because of drm/amdgpu merged other people's patch.
Sui Jingfeng (9):
video/aperture: Add a helper to detect if an aperture contains
firmware FB
video/aperture: Add a helper for determining if an unmoved aperture
contain FB
PCI/VGA: Switch to aperture_contain_firmware_fb_nonreloc() PCI/VGA: Improve the default VGA device selection drm/amdgpu: Implement the is_primary_gpu callback of
vga_client_register()
drm/radeon: Add an implement for the is_primary_gpu function callback drm/i915: Add an implement for the is_primary_gpu hook drm/ast: Register as a vga client to vgaarb by calling
vga_client_register()
drm/loongson: Add an implement for the is_primary_gpu function
callback
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++- drivers/gpu/drm/ast/ast_drv.c | 29 +++++++++ drivers/gpu/drm/drm_aperture.c | 16 +++++ drivers/gpu/drm/i915/display/intel_vga.c | 31 ++++++++- drivers/gpu/drm/loongson/lsdc_drv.c | 10 ++- drivers/gpu/drm/nouveau/nouveau_vga.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 12 +++- drivers/pci/vgaarb.c | 74 ++++++++++++++++------ drivers/vfio/pci/vfio_pci_core.c | 2 +- drivers/video/aperture.c | 65 +++++++++++++++++++ include/drm/drm_aperture.h | 2 + include/linux/aperture.h | 14 ++++ include/linux/vgaarb.h | 8 ++- 13 files changed, 247 insertions(+), 30 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/9 video/aperture: Add a helper to detect if an aperture contains firmware FB
From: Sui Jingfeng <[email protected]>
This patch adds the aperture_contain_firmware_fb() function to do the determination. Unfortunately, due to the fact that the apertures list will be freed dynamically, the location and size information of the firmware FB will be lost after dedicated drivers call aperture_remove_conflicting_devices(), aperture_remove_conflicting_pci_devices() or aperture_remove_all_conflicting_devices() functions
We solve this problem by introducing two static variables that record the firmware framebuffer's start addrness and end addrness. It assumes that the system has only one active firmware framebuffer driver at a time. We don't use the global structure screen_info here, because PCI resources may get reallocated (the VRAM BAR could be moved) during the kernel boot stage.
--- drivers/gpu/drm/drm_aperture.c | 16 ++++++++++++++++ drivers/video/aperture.c | 29 +++++++++++++++++++++++++++++ include/drm/drm_aperture.h | 2 ++ include/linux/aperture.h | 7 +++++++ 4 files changed, 54 insertions(+)
drivers/gpu/drm/drm_aperture.c +16 -0
@@ -190,3 +190,19 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,return aperture_remove_conflicting_pci_devices (pdev, req_driver->name); }EXPORT_SYMBOL (drm_aperture_remove_conflicting_pci_framebuffers); + +/** +* drm_aperture_contain_firmware_fb - Determine if a aperture contains firmware framebuffer +* +* @base: the aperture's base address in physical memory +* @size: aperture size in bytes +* +* Returns: +* true if there exist a firmware framebuffer inside of the aperture passed in, +* or false otherwise. +*/ +bool drm_aperture_contain_firmware_fb (resource_size_t base,resource_size_t size) +{ +return aperture_contain_firmware_fb (base, base + size); +} +EXPORT_SYMBOL (drm_aperture_contain_firmware_fb);
drivers/video/aperture.c +29 -0
@@ -141,6 +141,9 @@ struct aperture_range {static LIST_HEAD (apertures);static DEFINE_MUTEX (apertures_lock); +static resource_size_t firm_fb_start; +static resource_size_t firm_fb_end; +static bool overlap (resource_size_t base1,resource_size_t end1,resource_size_t base2,resource_size_t end2) {
@@ -170,6 +173,9 @@ static int devm_aperture_acquire(struct device *dev,mutex_lock (&apertures_lock); + firm_fb_start = base; + firm_fb_end = end; +list_for_each (pos, &apertures) { ap = container_of(pos, struct aperture_range, lh);if (overlap (base, end, ap->base, ap->base + ap->size)) {
@@ -377,3 +383,26 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na }EXPORT_SYMBOL (aperture_remove_conflicting_pci_devices); + +/** +* aperture_contain_firmware_fb - Detect if the firmware framebuffer belong to +* a aperture. +* @ap_start: the aperture's start address in physical memory +* @ap_end: the aperture's end address in physical memory +* +* Returns: +* true if there is a firmware framebuffer belong to the aperture passed in, +* or false otherwise. +*/ +bool aperture_contain_firmware_fb (resource_size_t ap_start,resource_size_t ap_end) +{ +/* No firmware framebuffer support */ +if (!firm_fb_start || !firm_fb_end) +return false; + +if (firm_fb_start >= ap_start && firm_fb_end <= ap_end) +return true; + +return false; +} +EXPORT_SYMBOL (aperture_contain_firmware_fb);
include/drm/drm_aperture.h +2 -0
@@ -35,4 +35,6 @@ drm_aperture_remove_framebuffers(const struct drm_driver *req_driver) req_driver); } +bool drm_aperture_contain_firmware_fb (resource_size_t base,resource_size_t size); +#endif
include/linux/aperture.h +7 -0
@@ -19,6 +19,8 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t siint __aperture_remove_legacy_vga_devices (struct pci_dev *pdev);int aperture_remove_conflicting_pci_devices (struct pci_dev *pdev,const char *name); + +bool aperture_contain_firmware_fb (resource_size_t ap_start,resource_size_t ap_end);#else static inline int devm_aperture_acquire_for_platform_device(struct platform_device *pdev, resource_size_t base,
@@ -42,6 +44,11 @@ static inline int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, {return 0 ; } + +static inline bool aperture_contain_firmware_fb (resource_size_t ap_start,resource_size_t ap_end) +{ +return false; +}#endif /**
Signature · 1 line
2.25.1
PATCH v3 2/9 video/aperture: Add a helper for determining if an unmoved aperture contain FB
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
This patch is intended to form a uniform approach to determining if an unmoved aperture contains the firmware FB. I believe that the global screen_info is more about video-specific things.
Putting it in video/aperture.c helps form a uniform approach.
--- drivers/video/aperture.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/aperture.h | 7 +++++++ 2 files changed, 43 insertions(+)
drivers/video/aperture.c +36 -0
@@ -6,6 +6,7 @@#include <linux/mutex.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/screen_info.h> #include <linux/slab.h> #include <linux/sysfb.h> #include <linux/types.h>
@@ -406,3 +407,38 @@ bool aperture_contain_firmware_fb(resource_size_t ap_start, resource_size_t ap_ereturn false; }EXPORT_SYMBOL (aperture_contain_firmware_fb); + +/** +* aperture_contain_firmware_fb_nonreloc - Detect if the firmware framebuffer +* belong to a non-relocatable aperture, such as the aperture of platform +* device. Note that this function relay on the global screen info. +* @ap_start: the aperture's start address in physical memory +* @ap_end: the aperture's end address in physical memory +* +* Returns: +* true if there is a firmware framebuffer belong to the aperture passed in, +* or false otherwise. +*/ +bool aperture_contain_firmware_fb_nonreloc (resource_size_t ap_start,resource_size_t ap_end) +{ +u64 fb_start; +u64 fb_end; + +if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) { + fb_start = (u64 )screen_info.ext_lfb_base <<32 | screen_info.lfb_base; + fb_end = fb_start + screen_info.lfb_size; + }else { + fb_start = screen_info.lfb_base; + fb_end = fb_start + screen_info.lfb_size; + } + +/* No firmware framebuffer support */ +if (!fb_start || !fb_end) +return false; + +if (fb_start >= ap_start && fb_end <= ap_end) +return true; + +return false; +} +EXPORT_SYMBOL (aperture_contain_firmware_fb_nonreloc);
include/linux/aperture.h +7 -0
@@ -21,6 +21,8 @@ int __aperture_remove_legacy_vga_devices(struct pci_dev *pdev);int aperture_remove_conflicting_pci_devices (struct pci_dev *pdev,const char *name);bool aperture_contain_firmware_fb (resource_size_t ap_start,resource_size_t ap_end); + +bool aperture_contain_firmware_fb_nonreloc (resource_size_t ap_start,resource_size_t ap_end);#else static inline int devm_aperture_acquire_for_platform_device(struct platform_device *pdev, resource_size_t base,
@@ -49,6 +51,11 @@ static inline bool aperture_contain_firmware_fb(resource_size_t ap_start, resour {return false; } + +static bool aperture_contain_firmware_fb_nonreloc (resource_size_t ap_start,resource_size_t ap_end) +{ +return false; +}#endif /**
Signature · 1 line
2.25.1
PATCH v3 3/9 PCI/VGA: Switch to aperture_contain_firmware_fb_nonreloc()
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
The observation behind this is that we should avoid accessing the global screen_info directly. Call the aperture_contain_firmware_fb_nonreloc() function to implement the detection of whether an aperture contains the firmware FB.
This patch helps to decouple the determination from the implementation. Or, in other words, we intend to make the determination opaque to the caller. The determination may choose to be arch-dependent or arch-independent. But vgaarb, as a consumer of the determination, shouldn't care how the does determination is implemented.
--- drivers/pci/vgaarb.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/pci/vgaarb.c +4 -15
@@ -14,6 +14,7 @@ #define vgaarb_info(dev, fmt, arg...) dev_info(dev, "vgaarb: " fmt, ##arg) #define vgaarb_err(dev, fmt, arg...) dev_err(dev, "vgaarb: " fmt, ##arg) +#include <linux/aperture.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/pci.h>
@@ -26,7 +27,6 @@#include <linux/poll.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/screen_info.h> #include <linux/vt.h> #include <linux/console.h> #include <linux/acpi.h>
@@ -558,20 +558,11 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc) }EXPORT_SYMBOL (vga_put); +/* Select the device owning the boot framebuffer if there is one */ static bool vga_is_firmware_default (struct pci_dev *pdev) {#if defined(CONFIG_X86 ) || defined(CONFIG_IA64 ) -u64 base = screen_info.lfb_base; -u64 size = screen_info.lfb_size;struct resource *r; -u64 limit; - -/* Select the device owning the boot framebuffer if there is one */ - -if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) - base |= (u64 )screen_info.ext_lfb_base <<32 ; - - limit = base + size;/* Does firmware framebuffer belong to us? */ pci_dev_for_each_resource (pdev, r) {
@@ -581,10 +572,8 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)if (!r->start || !r->end)continue ; -if (base < r->start || limit >= r->end) -continue ; - - return true; +if (aperture_contain_firmware_fb_nonreloc (r->start, r->end)) + return true; }#endif return false;
Signature · 1 line
2.25.1
PATCH v3 4/9 PCI/VGA: Improve the default VGA device selection
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
Currently, the strategy of selecting the default boot on a multiple video card coexistence system is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.
With the observation that device drivers may have better knowledge about which PCI bar contains the firmware FB. This patch tries to solve the above problems by introducing a function callback to the vga_client_register() function interface. DRM device drivers for the PCI device could provide a xx_vga_is_primary_gpu() function callback during the driver loading time. Once the driver binds the device successfully, VRAARB will call back to the driver. This gives the device drivers a chance to provide accurate boot device identification. Which in turn unlock the abitration service to non-x86 architectures. A device driver can also just pass a NULL pointer to keep the original behavior.
This patch is intended to introducing the mechanism only, the specific implementation is left to the authors of various device driver. Also honor the comment: "Clients have *TWO* callback mechanisms they can use"
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/i915/display/intel_vga.c | 3 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/pci/vgaarb.c | 55 ++++++++++++++++++++-- drivers/vfio/pci/vfio_pci_core.c | 2 +- include/linux/vgaarb.h | 8 ++-- 8 files changed, 61 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -4103,7 +4103,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,/* 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, amdgpu_device_vga_set_decode); +vga_client_register (adev->pdev, amdgpu_device_vga_set_decode,NULL ); px =amdgpu_device_supports_px (ddev);
drivers/gpu/drm/i915/display/intel_vga.c +1 -2
@@ -115,7 +115,6 @@ intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)int intel_vga_register (struct drm_i915_private *i915) { -struct pci_dev *pdev =to_pci_dev (i915->drm.dev);int ret;
@@ -127,7 +126,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, intel_vga_set_decode); + ret =vga_client_register (pdev, intel_vga_set_decode,NULL );if (ret && ret != -ENODEV )return ret;
drivers/gpu/drm/loongson/lsdc_drv.c +1 -1
@@ -289,7 +289,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, ddev); -vga_client_register (pdev, lsdc_vga_set_decode); +vga_client_register (pdev, lsdc_vga_set_decode,NULL );drm_kms_helper_poll_init (ddev);
drivers/gpu/drm/nouveau/nouveau_vga.c +1 -1
@@ -92,7 +92,7 @@ nouveau_vga_init(struct nouveau_drm *drm)return ; pdev =to_pci_dev (dev->dev); -vga_client_register (pdev, nouveau_vga_set_decode); +vga_client_register (pdev, nouveau_vga_set_decode,NULL );/* don't register Thunderbolt eGPU with vga_switcheroo */ if (pci_is_thunderbolt_attached (pdev))
drivers/gpu/drm/radeon/radeon_device.c +1 -1
@@ -1425,7 +1425,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, radeon_vga_set_decode); +vga_client_register (rdev->pdev, radeon_vga_set_decode,NULL );if (rdev->flags &RADEON_IS_PX ) runtime = true;
drivers/pci/vgaarb.c +50 -5
94 lines not on this page · raw message
drivers/vfio/pci/vfio_pci_core.c +1 -1
@@ -2108,7 +2108,7 @@ static int vfio_pci_vga_init(struct vfio_pci_core_device *vdev)if (ret)return ret; - ret =vga_client_register (pdev, vfio_pci_set_decode); + ret =vga_client_register (pdev, vfio_pci_set_decode,NULL );if (ret)return ret;vga_set_legacy_decoding (pdev,vfio_pci_set_decode (pdev, false));
include/linux/vgaarb.h +5 -3
@@ -33,7 +33,8 @@ 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, -unsigned int (*set_decode)(struct pci_dev *pdev,bool state)); +unsigned int (*set_decode)(struct pci_dev *pdev,bool state), +bool (*is_primary_gpu)(struct pci_dev *pdev));#else /* CONFIG_VGA_ARB */ static inline void vga_set_legacy_decoding (struct pci_dev *pdev,unsigned int decodes)
@@ -59,7 +60,8 @@ static inline int vga_remove_vgacon(struct pci_dev *pdev)return 0 ; }static inline int vga_client_register (struct pci_dev *pdev, -unsigned int (*set_decode)(struct pci_dev *pdev,bool state)) +unsigned int (*set_decode)(struct pci_dev *pdev,bool state), +bool (*is_primary_gpu)(struct pci_dev *pdev)) {return 0 ; }
@@ -97,7 +99,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 ); +vga_client_register (pdev,NULL ,NULL ); }#endif /* LINUX_VGA_H */
Signature · 1 line
2.25.1
PATCH v3 5/9 drm/amdgpu: Implement the is_primary_gpu callback of vga_client_register()
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
[why]
The vga_is_firmware_default() function defined in drivers/pci/vgaarb.c is arch-dependent, it's a dummy on non-x86 architectures. This made VGAARB lost an important condition for the arbitration on non-x86 platform. The rules about which GPU is (or should be) the primary display device get used by userspace are obscure on non-x86 platform, let's made the things clear.
[how]
The device that owns the firmware framebuffer should be the default boot device. This patch adds an arch-independent function to implement this rule. The vgaarb subsystem will call back to amdgpu_is_primary_gpu() when drm/amdgpu is bound to an AMDGPU device successfully.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -1
@@ -3690,6 +3690,15 @@ static void amdgpu_device_set_mcbp(struct amdgpu_device *adev)DRM_INFO ("MCBP is enabled\n" ); } +static bool amdgpu_is_primary_gpu (struct pci_dev *pdev) +{ +struct drm_device *dev =pci_get_drvdata (pdev); +struct amdgpu_device *adev =drm_to_adev (dev); +struct amdgpu_gmc *gmc = &adev->gmc; + +return drm_aperture_contain_firmware_fb (gmc->aper_base, gmc->aper_size); +} +/** * amdgpu_device_init - initialize the driver *
@@ -4103,7 +4112,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,/* 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, amdgpu_device_vga_set_decode,NULL ); +vga_client_register (adev->pdev, amdgpu_device_vga_set_decode, + amdgpu_is_primary_gpu); px =amdgpu_device_supports_px (ddev);
Signature · 1 line
2.25.1
PATCH v3 6/9 drm/radeon: Add an implement for the is_primary_gpu function callback
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
[why]
The vga_is_firmware_default() function defined in drivers/pci/vgaarb.c is arch-dependent, it's no-op on non-x86 architectures. The arbitration is not usabe on non-x86 platform.
[how]
The device that owns the firmware framebuffer should be the default boot device. This patch adds an arch-independent function to implement this rule. The vgaarb will call back to radeon_is_primary_gpu() when drm/radeon is bound to a ATI gpu device successfully.
--- drivers/gpu/drm/radeon/radeon_device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_device.c +11 -1
@@ -34,6 +34,7 @@#include <linux/vga_switcheroo.h> #include <linux/vgaarb.h> +#include <drm/drm_aperture.h> #include <drm/drm_cache.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_device.h>
@@ -1263,6 +1264,15 @@ static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = { .can_switch = radeon_switcheroo_can_switch, }; +static bool radeon_vga_is_primary_gpu (struct pci_dev *pdev) +{ +struct drm_device *dev =pci_get_drvdata (pdev); +struct radeon_device *rdev = dev->dev_private; +struct radeon_mc *gmc = &rdev->mc; + +return drm_aperture_contain_firmware_fb (gmc->aper_base, gmc->aper_size); +} +/** * radeon_device_init - initialize the driver *
@@ -1425,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, radeon_vga_set_decode,NULL ); +vga_client_register (rdev->pdev, radeon_vga_set_decode, radeon_vga_is_primary_gpu);if (rdev->flags &RADEON_IS_PX ) runtime = true;
Signature · 1 line
2.25.1
PATCH v3 7/9 drm/i915: Add an implement for the is_primary_gpu hook
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
This patch add a function to identify if a device is the default boot selected by the firmware, it require the GPU has firmware framebuffer driver support (such as efifb). If a specific hardware doesn't have firmware framebuffer support, then the introduced function will just return false. But even in this case, it still do no harms.
--- drivers/gpu/drm/i915/display/intel_vga.c | 30 +++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_vga.c +29 -1
@@ -3,9 +3,12 @@* Copyright © 2019 Intel Corporation */ +#include <linux/aperture.h> #include <linux/pci.h> #include <linux/vgaarb.h> +#include <drm/drm_aperture.h> +#include <video/vga.h> #include "soc/intel_gmch.h"
@@ -113,6 +116,30 @@ intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)return VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ; } +static bool intel_vga_is_primary_gpu (struct pci_dev *pdev) +{ +struct drm_i915_private *i915 =pdev_to_i915 (pdev); +struct i915_gem_mm *mm = &i915->mm; +struct intel_gt *gt = &i915->gt0; +struct i915_ggtt *ggtt = gt->ggtt; +unsigned int i; + +if (aperture_contain_firmware_fb (ggtt->gmadr.start, ggtt->gmadr.end)) +return true; + +for (i =0 ; i <ARRAY_SIZE (mm->regions); i++) { +struct intel_memory_region *mr = mm->regions[i]; + +if (mr) { +if (drm_aperture_contain_firmware_fb (mr->io_start, + mr->io_size)) +return true; + } + } + +return false; +} +int intel_vga_register (struct drm_i915_private *i915) {struct pci_dev *pdev =to_pci_dev (i915->drm.dev);
@@ -126,7 +153,8 @@ 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, intel_vga_set_decode,NULL ); + ret =vga_client_register (pdev, intel_vga_set_decode, + intel_vga_is_primary_gpu);if (ret && ret != -ENODEV )return ret;
Signature · 1 line
2.25.1
PATCH v3 8/9 drm/ast: Register as a vga client to vgaarb by calling vga_client_register()
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
Becasuse the VGA Display Controller in the ASpeed BMC chip is also a PCIe device, the Software Programming guide of AST2400 say that it is Fully IBM VGA compliant, thus, it should also particiate in the arbitration.
--- drivers/gpu/drm/ast/ast_drv.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/ast/ast_drv.c +29 -0
@@ -28,6 +28,7 @@#include <linux/module.h> #include <linux/pci.h> +#include <linux/vgaarb.h> #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h>
@@ -89,6 +90,32 @@ static const struct pci_device_id ast_pciidlist[] = {MODULE_DEVICE_TABLE (pci, ast_pciidlist); +static bool ast_vga_is_primary_gpu (struct pci_dev *pdev) +{ +struct drm_device *drm =pci_get_drvdata (pdev); +struct ast_device *ast =to_ast_device (drm); + +return drm_aperture_contain_firmware_fb (ast->vram_base, ast->vram_size); +} + +static unsigned int ast_vga_set_decode (struct pci_dev *pdev,bool state) +{ +struct drm_device *drm =pci_get_drvdata (pdev); +struct ast_device *ast =to_ast_device (drm); + +if (state) { +/* Enable standard VGA decode and Enable normal VGA decode */ +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); + +return VGA_RSRC_LEGACY_IO |VGA_RSRC_LEGACY_MEM | +VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ; + } + +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x07 ); + +return VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ; +} +static int ast_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {struct ast_device *ast;
@@ -112,6 +139,8 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret)return ret; +vga_client_register (pdev, ast_vga_set_decode, ast_vga_is_primary_gpu); +drm_fbdev_generic_setup (dev,32 );return 0 ;
Signature · 1 line
2.25.1
PATCH v3 9/9 drm/loongson: Add an implement for the is_primary_gpu function callback
In reply to Sui JingfengFrom: Sui Jingfeng <[email protected]>
--- drivers/gpu/drm/loongson/lsdc_drv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/loongson/lsdc_drv.c +9 -1
@@ -257,6 +257,14 @@ static unsigned int lsdc_vga_set_decode(struct pci_dev *pdev, bool state)return VGA_RSRC_NORMAL_IO |VGA_RSRC_NORMAL_MEM ; } +static bool lsdc_is_primary_gpu (struct pci_dev *pdev) +{ +struct drm_device *ddev =pci_get_drvdata (pdev); +struct lsdc_device *ldev =to_lsdc (ddev); + +return drm_aperture_contain_firmware_fb (ldev->vram_base, ldev->vram_size); +} +static int lsdc_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {const struct lsdc_desc *descp;
@@ -289,7 +297,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, ddev); -vga_client_register (pdev, lsdc_vga_set_decode,NULL ); +vga_client_register (pdev, lsdc_vga_set_decode, lsdc_is_primary_gpu);drm_kms_helper_poll_init (ddev);
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for PCI/VGA: Improve the default VGA device selection
In reply to Sui Jingfeng== Series Details ==
== Series Details ==
Series: PCI/VGA: Improve the default VGA device selection
URL : https://patchwork.freedesktop.org/series/120561/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/120561/revisions/1/mbox/ not applied
Applying: video/aperture: Add a helper to detect if an aperture contains firmware FB
Applying: video/aperture: Add a helper for determining if an unmoved aperture contain FB
Applying: PCI/VGA: Switch to aperture_contain_firmware_fb_nonreloc()
Applying: PCI/VGA: Improve the default VGA device selection
error: sha1 information is lacking or useless (drivers/pci/vgaarb.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 PCI/VGA: Improve the default VGA device selection
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Hi,
Because after applied that patch, there have only one callback mechanism we can use, not two anymore.
Quoted 296 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
Currently, the strategy of selecting the default boot on a multiple video card coexistence system is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.With the observation that device drivers may have better knowledge about which PCI bar contains the firmware FB. This patch tries to solve the above problems by introducing a function callback to the
vga_client_register()function interface. DRM device drivers for the PCI device could provide axx_vga_is_primary_gpu()function callback during the driver loading time. Once the driver binds the device successfully, VRAARB will call back to the driver. This gives the device drivers a chance to provide accurate boot device identification. Which in turn unlock the abitration service to non-x86 architectures. A device driver can also just pass a NULL pointer to keep the original behavior.This patch is intended to introducing the mechanism only, the specific implementation is left to the authors of various device driver. Also honor the comment: "Clients have *TWO* callback mechanisms they can use"
Cc Alex Deucher <[email protected]>Cc Christian Konig <[email protected]>Cc Pan Xinhui <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Alex Williamson <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Hawking Zhang <[email protected]>Cc Mario Limonciello <[email protected]>Cc Lijo Lazar <[email protected]>Cc YiPeng Chai <[email protected]>Cc Bokun Zhang <[email protected]>Cc Likun Gao <[email protected]>Cc Ville Syrjala <[email protected]>Cc Jason Gunthorpe <[email protected]>CC Kevin Tian <[email protected]>Cc Cornelia Huck <[email protected]>Cc Yishai Hadas <[email protected]>Cc Abhishek Sahu <[email protected]>Cc Yi Liu <[email protected]>Reviewed-by Lyude Paul <[email protected]> # nouveauSigned-off-by Sui Jingfeng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/i915/display/intel_vga.c | 3 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/pci/vgaarb.c | 55 ++++++++++++++++++++-- drivers/vfio/pci/vfio_pci_core.c | 2 +- include/linux/vgaarb.h | 8 ++-- 8 files changed, 61 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -4103,7 +4103,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,/* 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, amdgpu_device_vga_set_decode); +vga_client_register (adev->pdev, amdgpu_device_vga_set_decode,NULL ); px =amdgpu_device_supports_px (ddev);drivers/gpu/drm/i915/display/intel_vga.c +1
-2@@ -115,7 +115,6 @@ intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)int intel_vga_register (struct drm_i915_private *i915) { -struct pci_dev *pdev =to_pci_dev (i915->drm.dev);int ret;@@ -127,7 +126,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, intel_vga_set_decode); + ret =vga_client_register (pdev, intel_vga_set_decode,NULL );if (ret && ret != -ENODEV )return ret;drivers/gpu/drm/loongson/lsdc_drv.c +1
-1@@ -289,7 +289,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, ddev); -vga_client_register (pdev, lsdc_vga_set_decode); +vga_client_register (pdev, lsdc_vga_set_decode,NULL );drm_kms_helper_poll_init (ddev);drivers/gpu/drm/nouveau/nouveau_vga.c +1
-1@@ -92,7 +92,7 @@ nouveau_vga_init(struct nouveau_drm *drm)return ; pdev =to_pci_dev (dev->dev); -vga_client_register (pdev, nouveau_vga_set_decode); +vga_client_register (pdev, nouveau_vga_set_decode,NULL );/* don't register Thunderbolt eGPU with vga_switcheroo */ if (pci_is_thunderbolt_attached (pdev))drivers/gpu/drm/radeon/radeon_device.c +1
-1@@ -1425,7 +1425,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, radeon_vga_set_decode); +vga_client_register (rdev->pdev, radeon_vga_set_decode,NULL );if (rdev->flags &RADEON_IS_PX ) runtime = true;drivers/pci/vgaarb.c +50
-5@@ -53,6 +53,7 @@ struct vga_device {bool bridge_has_one_vga;bool is_firmware_default;/* device selected by firmware */ unsigned int (*set_decode)(struct pci_dev *pdev,bool decode); +bool (*is_primary_gpu)(struct pci_dev *pdev); };static LIST_HEAD (vga_list);@@ -958,6 +959,13 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);* @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. * +* @is_primary_gpu callback: call back to the device driver, query if a PCI +* GPU client is the primary display device, as device drivers (drm-based +* or fbdev-based) may have better knowledge if a specific device is the +* default boot device or should be the default boot device. But this +* callback is optional. A device driver can simply pass a NULL pointer to +* adhere to the original rules of arbitration. +* * Rationale: we cannot disable VGA decode resources unconditionally, some * single GPU laptops seem to require ACPI or BIOS access to the VGA registers * to control things like backlights etc. Hopefully newer multi-GPU laptops do @@ -973,7 +981,8 @@ EXPORT_SYMBOL(vga_set_legacy_decoding);* Returns: 0 on success, -1 on failure */ int vga_client_register (struct pci_dev *pdev, -unsigned int (*set_decode)(struct pci_dev *pdev,bool decode)) +unsigned int (*set_decode)(struct pci_dev *pdev,bool decode), +bool (*is_primary_gpu)(struct pci_dev *pdev)) {int ret = -ENODEV ;struct vga_device *vgadev;@@ -985,6 +994,7 @@ int vga_client_register(struct pci_dev *pdev, goto bail; vgadev->set_decode = set_decode; + vgadev->is_primary_gpu = is_primary_gpu; ret =0 ; bail:@@ -1490,6 +1500,30 @@ static void vga_arbiter_notify_clients(void)spin_unlock_irqrestore (&vga_lock, flags); } +static void vga_arbiter_do_arbitration (struct pci_dev *pdev) +{ +struct vga_device *vgadev; +unsigned long flags; + +spin_lock_irqsave (&vga_lock, flags); +list_for_each_entry (vgadev, &vga_list, list) { +if (vgadev->pdev != pdev) +continue ; + +/* This device already the boot device, do nothing */ +if (pdev ==vga_default_device ()) +break ; + +if (vgadev->is_primary_gpu) { +if (vgadev->is_primary_gpu (pdev)) { +vgaarb_info (&pdev->dev,"Overriding as primary GPU\n" ); +vga_set_default_device (pdev); + } + } + } +spin_unlock_irqrestore (&vga_lock, flags); +} +static int pci_notify (struct notifier_block *nb,unsigned long action,void *data) {@@ -1509,13 +1543,24 @@ static int pci_notify(struct notifier_block *nb, unsigned long action,* cases of hotplugable vga cards. */ -if (action ==BUS_NOTIFY_ADD_DEVICE ) +switch (action) { +case BUS_NOTIFY_ADD_DEVICE : notify =vga_arbiter_add_pci_device (pdev); -else if (action ==BUS_NOTIFY_DEL_DEVICE ) +if (notify) +vga_arbiter_notify_clients (); +break ; +case BUS_NOTIFY_DEL_DEVICE : notify =vga_arbiter_del_pci_device (pdev); +if (notify) +vga_arbiter_notify_clients (); +break ; +case BUS_NOTIFY_BOUND_DRIVER : +vga_arbiter_do_arbitration (pdev); +break ; +default : +break ; + } -if (notify) -vga_arbiter_notify_clients ();return 0 ; }drivers/vfio/pci/vfio_pci_core.c +1
-1@@ -2108,7 +2108,7 @@ static int vfio_pci_vga_init(struct vfio_pci_core_device *vdev)if (ret)return ret; - ret =vga_client_register (pdev, vfio_pci_set_decode); + ret =vga_client_register (pdev, vfio_pci_set_decode,NULL );if (ret)return ret;vga_set_legacy_decoding (pdev,vfio_pci_set_decode (pdev, false));include/linux/vgaarb.h +5
-3@@ -33,7 +33,8 @@ 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, -unsigned int (*set_decode)(struct pci_dev *pdev,bool state)); +unsigned int (*set_decode)(struct pci_dev *pdev,bool state), +bool (*is_primary_gpu)(struct pci_dev *pdev));#else /* CONFIG_VGA_ARB */ static inline void vga_set_legacy_decoding (struct pci_dev *pdev,unsigned int decodes)@@ -59,7 +60,8 @@ static inline int vga_remove_vgacon(struct pci_dev *pdev)return 0 ; }static inline int vga_client_register (struct pci_dev *pdev, -unsigned int (*set_decode)(struct pci_dev *pdev,bool state)) +unsigned int (*set_decode)(struct pci_dev *pdev,bool state), +bool (*is_primary_gpu)(struct pci_dev *pdev)) {return 0 ; }@@ -97,7 +99,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 ); +vga_client_register (pdev,NULL ,NULL ); }#endif /* LINUX_VGA_H */
[+cc linux-pci (please cc in the future since the bulk of this patch is in drivers/pci/)]
Quoted 6 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
Currently, the strategy of selecting the default boot on a multiple video card coexistence system is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
Which function in particular is a no-op for non-x86?
Quoted 7 lines
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.
I don't think we need a list of *potential* problems. We need an example of the specific problem this will solve, i.e., what currently does not work?
The drm/ast and maybe drm/loongson patches are the only ones that use the new callback, so I assume there are real problems with those drivers.
CONFIG_DRM_AST is a tristate. We're talking about identifying the boot-time console device. So if CONFIG_DRM_AST=m, I guess we don't get the benefit of the new callback unless the module gets loaded?
Quoted 2 lines
Also honor the comment: "Clients have *TWO* callback mechanisms they can use"
This refers to the existing vga_client_register() function comment:
* vga_client_register - register or unregister a VGA arbitration client
* @pdev: pci device of the VGA client
* @set_decode: vga decode change callback
*
* Clients have two callback mechanisms they can use.
*
* @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.
and the fact that struct vga_device currently only contains *one* callback function pointer:
unsigned int (*set_decode)(struct pci_dev *pdev, bool decode);
Adding the .is_primary_gpu() callback does mean there will now be two callbacks, as the comment says, but I think it's just confusing to mention this in the commit log, so I would just remove it.
Quoted 13 lines
drivers/pci/vgaarb.c +6
-2@@ -1509,13 +1543,24 @@ static int pci_notify(struct notifier_block *nb, unsigned long action,* cases of hotplugable vga cards. */ -if (action ==BUS_NOTIFY_ADD_DEVICE ) +switch (action) { +case BUS_NOTIFY_ADD_DEVICE : notify =vga_arbiter_add_pci_device (pdev); -else if (action ==BUS_NOTIFY_DEL_DEVICE ) +if (notify) +vga_arbiter_notify_clients (); +break ; +case BUS_NOTIFY_DEL_DEVICE :
drivers/pci/vgaarb.c static int pci_notify(struct notifier_block *nb, unsigned long action, · line 1562
Quoted 10 lines
drivers/pci/vgaarb.c +9
-0notify =vga_arbiter_del_pci_device (pdev); +if (notify) +vga_arbiter_notify_clients (); +break ; +case BUS_NOTIFY_BOUND_DRIVER : +vga_arbiter_do_arbitration (pdev); +break ; +default : +break ; + }
Changing from if/else to switch makes the patch bigger than necessary for no real benefit and obscures what is really changing.
Bjorn
[+cc linux-pci]
Quoted 17 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
Currently, the default VGA device selection is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device on a multiple video card coexistence system. But this is still a policy because it doesn't give the user a choice to override.With the observation that device drivers or video aperture helpers may have better knowledge about which PCI bar contains the firmware FB,
Quoted 8 lines
This patch tries to solve the above problems by introducing a function callback to the
vga_client_register()function interface. DRM device drivers for the PCI device need to register theis_boot_device()function callback during the driver loading time. Once the driver binds the device successfully, VRAARB will call back to the driver. This gives the device drivers a chance to provide accurate boot device identification. Which in turn unlock the abitration service to non-x86 architectures. A device driver can also pass a NULL pointer to keep the original behavior.
I skimmed all these patches, but the only one that seems to mention an actual problem being solved, i.e., something that doesn't work for an end user, is "drm/ast: Register as a vga client ..." Maybe "drm/loongson: Add an implement for ..." also solves a problem, but it lacks a commit log, so I don't know what the problem is.
In the future, can you please cc: linux-pci with the entire series? In this posting, only the patches that touched drivers/pci/vgaarb.c went to linux-pci, but those aren't enough to make sense of the series as a whole.
Quoted 5 lines
video/aperture: Add a helper to detect if an aperture contains
firmware FB
video/aperture: Add a helper for determining if an unmoved aperture
contain FB
PCI/VGA: Switch toaperture_contain_firmware_fb_nonreloc()
Since this subject includes the function name (which is nice!), it would also be helpful if the "Add a helper ..." subject included the same function name.
Quoted 1 line
PCI/VGA: Improve the default VGA device selection
If you can make this subject any more specific, that would be useful. There's more to say about that patch, so I'll respond there.
Quoted 8 lines
drm/amdgpu: Implement the
is_primary_gpucallback of
vga_client_register()
drm/radeon: Add an implement for theis_primary_gpufunction callback drm/i915: Add an implement for theis_primary_gpuhook drm/ast: Register as a vga client to vgaarb by calling
vga_client_register()
drm/loongson: Add an implement for theis_primary_gpufunction
callback
There's unnecessary variation in the subject lines (and the commit logs) of these patches. If they all do the same thing but in different drivers, it's useful if the patches all *look* the same.
You might be able to write these subjects as "Implement .is_primary_gpu() callback" for brevity.
Bjorn
Re: [Intel-gfx] [PATCH v3 3/9] PCI/VGA: Switch to aperture_contain_firmware_fb_nonreloc()
In reply to Sui Jingfeng[+cc linux-pci; I don't apply or ack PCI patches unless they appear there]
Quoted 6 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
The observation behind this is that we should avoid accessing the global
screen_infodirectly. Call theaperture_contain_firmware_fb_nonreloc()function to implement the detection of whether an aperture contains the firmware FB.
Because it's better to access the global screen_info from aperture_contain_firmware_fb_nonreloc()? The reasoning here is not super clear to me.
Quoted 5 lines
This patch helps to decouple the determination from the implementation. Or, in other words, we intend to make the determination opaque to the caller. The determination may choose to be arch-dependent or arch-independent. But vgaarb, as a consumer of the determination, shouldn't care how the does determination is implemented.
"how the determination ..." (drop the "does")
Are you saying that aperture_contain_firmware_fb_nonreloc() might be arch-dependent? Are there multiple callers? Or does this just move code from one place to a more appropriate place?
Quoted 63 lines
Signed-off-by Sui Jingfeng <[email protected]>--- drivers/pci/vgaarb.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)drivers/pci/vgaarb.c +4
-15@@ -14,6 +14,7 @@ #define vgaarb_info(dev, fmt, arg...) dev_info(dev, "vgaarb: " fmt, ##arg) #define vgaarb_err(dev, fmt, arg...) dev_err(dev, "vgaarb: " fmt, ##arg) +#include <linux/aperture.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/pci.h> @@ -26,7 +27,6 @@#include <linux/poll.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/screen_info.h> #include <linux/vt.h> #include <linux/console.h> #include <linux/acpi.h> @@ -558,20 +558,11 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc) }EXPORT_SYMBOL (vga_put); +/* Select the device owning the boot framebuffer if there is one */ static bool vga_is_firmware_default (struct pci_dev *pdev) {#if defined(CONFIG_X86 ) || defined(CONFIG_IA64 ) -u64 base = screen_info.lfb_base; -u64 size = screen_info.lfb_size;struct resource *r; -u64 limit; - -/* Select the device owning the boot framebuffer if there is one */ - -if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) - base |= (u64 )screen_info.ext_lfb_base <<32 ; - - limit = base + size;/* Does firmware framebuffer belong to us? */ pci_dev_for_each_resource (pdev, r) {@@ -581,10 +572,8 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)if (!r->start || !r->end)continue ; -if (base < r->start || limit >= r->end) -continue ; - - return true; +if (aperture_contain_firmware_fb_nonreloc (r->start, r->end)) + return true; }#endif return false;Signature · 1 line
2.25.1
Re: [PATCH v3 1/9] video/aperture: Add a helper to detect if an aperture contains firmware FB
In reply to Sui JingfengQuoted 10 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
This patch adds the
aperture_contain_firmware_fb()function to do the determination. Unfortunately, due to the fact that the apertures list will be freed dynamically, the location and size information of the firmware FB will be lost after dedicated drivers callaperture_remove_conflicting_devices(),aperture_remove_conflicting_pci_devices()oraperture_remove_all_conflicting_devices()functions
Quoted 5 lines
We solve this problem by introducing two static variables that record the firmware framebuffer's start addrness and end addrness. It assumes that the system has only one active firmware framebuffer driver at a time. We don't use the global structure
screen_infohere, because PCI resources may get reallocated (the VRAM BAR could be moved) during the kernel boot stage.
s/addrness/address/ (twice)
Re: [PATCH v3 1/9] video/aperture: Add a helper to detect if an aperture contains firmware FB
Hi,
Quoted 15 lines · Bjorn Helgaas
Quoted 14 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
This patch adds the
aperture_contain_firmware_fb()function to do the determination. Unfortunately, due to the fact that the apertures list will be freed dynamically, the location and size information of the firmware FB will be lost after dedicated drivers callaperture_remove_conflicting_devices(),aperture_remove_conflicting_pci_devices()oraperture_remove_all_conflicting_devices()functions
We solve this problem by introducing two static variables that record the firmware framebuffer's start addrness and end addrness. It assumes that the system has only one active firmware framebuffer driver at a time. We don't use the global structurescreen_infohere, because PCI resources may get reallocated (the VRAM BAR could be moved) during the kernel boot stage.
Quoted 1 line
s/addrness/address/ (twice)
Will be fixed at the next version, thanks.
Re: [Intel-gfx] [PATCH v3 3/9] PCI/VGA: Switch to aperture_contain_firmware_fb_nonreloc()
In reply to Bjorn HelgaasHi,
Quoted 5 lines · Bjorn Helgaas
[+cc linux-pci; I don't apply or ack PCI patches unless they appear there]
Quoted 2 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
Quoted 7 lines
Quoted 4 lines
The observation behind this is that we should avoid accessing the global
screen_infodirectly. Call theaperture_contain_firmware_fb_nonreloc()function to implement the detection of whether an aperture contains the firmware FB.Because it's better to access the global
screen_infofromaperture_contain_firmware_fb_nonreloc()? The reasoning here is not super clear to me.
Yes, honestly the benefits of this patch is not obvious.
But I do have some (may not practical) ideas in my mind when I create this patch.
See my explanation at the end.
Quoted 6 lines
Quoted 5 lines
This patch helps to decouple the determination from the implementation. Or, in other words, we intend to make the determination opaque to the caller. The determination may choose to be arch-dependent or arch-independent. But vgaarb, as a consumer of the determination, shouldn't care how the does determination is implemented.
"how the determination ..." (drop the "does")
Ok, will be fixed at the next version.
Quoted 4 lines
Are you saying that
aperture_contain_firmware_fb_nonreloc()might be arch-dependent? Are there multiple callers? Or does this just move code from one place to a more appropriate place?
1) To form a unify approach, and drop the screen_info.h header.
There are similar cleanup patch at patchwork.
screen_info.h is definitely arch-dependent, while vgaarb is just device-dependent.
I think, they do have subtle difference.
2) Convert the *device driven* to the "driver driven".
Move it from vgaarb.c to video/apperture allow code sharing.
While this function are not going to be shared in vgaarb.
Previous it is the device make the decision,
after applied this patch it allow driver make the decision.
They do have subtle difference.
Emm, I will try to give some examples at the next version.
3) I was imagine to drag platform display controllers in (get platform devices involved in the arbitration).
As Alex seem hint to implement something platform-independent.
The aperture_contain_firmware_fb_nonreloc() actually is possible be shared.
The aperture of platform device will be not moved.
So it seems that platform device driver could call this function to do something else.
Quoted 63 lines
Quoted 63 lines
Signed-off-by Sui Jingfeng <[email protected]>--- drivers/pci/vgaarb.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)drivers/pci/vgaarb.c +4
-15@@ -14,6 +14,7 @@ #define vgaarb_info(dev, fmt, arg...) dev_info(dev, "vgaarb: " fmt, ##arg) #define vgaarb_err(dev, fmt, arg...) dev_err(dev, "vgaarb: " fmt, ##arg) +#include <linux/aperture.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/pci.h> @@ -26,7 +27,6 @@#include <linux/poll.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/screen_info.h> #include <linux/vt.h> #include <linux/console.h> #include <linux/acpi.h> @@ -558,20 +558,11 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc) }EXPORT_SYMBOL (vga_put); +/* Select the device owning the boot framebuffer if there is one */ static bool vga_is_firmware_default (struct pci_dev *pdev) {#if defined(CONFIG_X86 ) || defined(CONFIG_IA64 ) -u64 base = screen_info.lfb_base; -u64 size = screen_info.lfb_size;struct resource *r; -u64 limit; - -/* Select the device owning the boot framebuffer if there is one */ - -if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) - base |= (u64 )screen_info.ext_lfb_base <<32 ; - - limit = base + size;/* Does firmware framebuffer belong to us? */ pci_dev_for_each_resource (pdev, r) {@@ -581,10 +572,8 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)if (!r->start || !r->end)continue ; -if (base < r->start || limit >= r->end) -continue ; - - return true; +if (aperture_contain_firmware_fb_nonreloc (r->start, r->end)) + return true; }#endif return false;Signature · 1 line
2.25.1
Hi,
Quoted 11 lines · Bjorn Helgaas
[+cc linux-pci (please cc in the future since the bulk of this patch is in
drivers/pci/)]Quoted 6 lines · Sui Jingfeng
From: Sui Jingfeng <[email protected]>
Currently, the strategy of selecting the default boot on a multiple video card coexistence system is not perfect. Potential problems are:
1) This function is a no-op on non-x86 architectures.
Which function in particular is a no-op for non-x86?
I refer to the vga_is_firmware_default() function,
I will improve the commit message at the next version. (To make it more human readable).
Thanks you point it out.
Quoted 10 lines
Quoted 7 lines
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.I don't think we need a list of *potential* problems. We need an example of the specific problem this will solve, i.e., what currently does not work?
1) The selection of primary GPU on Non-x86 platform. (Arm64, risc-v, powerpc etc)
Mostly server platforms have equipped with aspeed bmc, and such hardware platforms have a lot PCIe slot.
So I think, aspeed bmc V.S (P.K) radeon(or amdgpu) is very common.
2) The ability to pass the control back to the end user.
Convert the *device driven* to the "driver driven" or "human driven".
Currently, it is the machine making the decision.
Emm, I probably will be able to give some examples at the next version.
Quoted 8 lines
The drm/ast and maybe drm/loongson patches are the only ones that use the new callback, so I assume there are real problems with those drivers.
CONFIG_DRM_ASTis a tristate. We're talking about identifying the boot-time console device. So ifCONFIG_DRM_AST=m, I guess we don't get the benefit of the new callback unless the module gets loaded?
Since, this patch set is mostly for the user of X server.
It is actually okey if CONFIG_DRM_AST=m. (it will be works no matter CONFIG_DRM_AST=m or CONFIG_DRM_AST=y)
As the device and the driver bound at a latter time.
So we are lucky, we need this behavior to implement the override.
Quoted 1 line · suijingfeng
it will be works no matter
CONFIG_DRM_AST=morCONFIG_DRM_AST=y
It will be works regardless of CONFIG_DRM_AST=m or CONFIG_DRM_AST=y.
When vgaarb call to the device driver, device driver already loaded successfully.
and the PCI(e) device emulation already finished.
So the last change the vgaarb gave us to override is actually happen very late.
But it will be happen as long as the device driver get loaded successfully.
Quoted 2 lines · Bjorn Helgaas
but I think it's just confusing to
mention this in the commit log, so I would just remove it.
Ok, will be done at the next version.
Hi,
Quoted 8 lines · Bjorn Helgaas
Quoted 8 lines
drm/amdgpu: Implement the
is_primary_gpucallback of
vga_client_register()
drm/radeon: Add an implement for theis_primary_gpufunction callback drm/i915: Add an implement for theis_primary_gpuhook drm/ast: Register as a vga client to vgaarb by calling
vga_client_register()
drm/loongson: Add an implement for theis_primary_gpufunction
callback
Quoted 6 lines
There's unnecessary variation in the subject lines (and the commit logs) of these patches. If they all do the same thing but in different drivers, it's useful if the patches all*look* the same.
You might be able to write these subjects as "Implement .is_primary_gpu() callback" for brevity.
This is a very good suggestion, I will adopt this.
Thanks, really.
Hi,
I was too hurry reply to you. I'm may miss the point for part of your reviews, Sorry.
Quoted 2 lines · Bjorn Helgaas
CONFIG_DRM_ASTis a tristate. We're talking about identifying the boot-time console device.
Yes, my patch will only works *after* the module gets loaded successfully.
But generally, vgaarb will select a default boot device before my patch taking into effect.
I means that vgaarb will select a default boot device by calling vga_arbiter_add_pci_device() function.
In practice, I still not notice any obvious problems.
I'm lack the knowledge about the boot-time console,
what is the potential problems with such a condition?
Quoted 2 lines
So if
CONFIG_DRM_AST=m, I guess we don't
get the benefit of the new callback unless the module gets loaded?
Yes, my approach will not works until the device driver kernel module gets loaded successfully.
So what's the problem with such a situation, do you see something weird ?
Hi,
Quoted 10 lines · Bjorn Helgaas
Quoted 7 lines
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.I don't think we need a list of*potential* problems. We need an example of the specific problem this will solve, i.e., what currently does not work?
This version do allow the arbitration service works on non-x86 arch,
which also allow me remove a arch-specific workaround.
I will give more detail at the next version.
But I want to provide one more drawback of vgaarb here:
(6) It does not works for non VGA-compatible PCI(e) display controllers.
Because, currently, vgaarb deal with PCI VGA compatible devices only.
See another my patch set [1] for more elaborate discussion.
It also ignore PCI_CLASS_NOT_DEFINED_VGA as Maciej puts it[2].
While my approach do not required the display controller to be VGA-compatible to enjoy the arbitration service.
What do you think then?
[1] https://patchwork.freedesktop.org/patch/546690/?series=120548&rev=1
Hi,
Thanks for you noticed my change.
Quoted 17 lines · Bjorn Helgaas
Quoted 17 lines
drivers/pci/vgaarb.c +9
-2@@ -1509,13 +1543,24 @@ static int pci_notify(struct notifier_block *nb, unsigned long action,* cases of hotplugable vga cards. */ -if (action ==BUS_NOTIFY_ADD_DEVICE ) +switch (action) { +case BUS_NOTIFY_ADD_DEVICE : notify =vga_arbiter_add_pci_device (pdev); -else if (action ==BUS_NOTIFY_DEL_DEVICE ) +if (notify) +vga_arbiter_notify_clients (); +break ; +case BUS_NOTIFY_DEL_DEVICE : notify =vga_arbiter_del_pci_device (pdev); +if (notify) +vga_arbiter_notify_clients (); +break ;
Quoted 8 lines
drivers/pci/vgaarb.c static int pci_notify(struct notifier_block *nb, unsigned long action, · line 1562
Quoted 6 lines
drivers/pci/vgaarb.c +6
-0+case BUS_NOTIFY_BOUND_DRIVER : +vga_arbiter_do_arbitration (pdev); +break ; +default : +break ; + }Changing from if/else to switch makes the patch bigger than necessary for no real benefit and obscures what is really changing.
Actually, the logic become more clear after this patch applied.
```
switch (action) {
case BUS_NOTIFY_ADD_DEVICE:
notify = vga_arbiter_add_pci_device(pdev);
if (notify)
vga_arbiter_notify_clients();
break;
case BUS_NOTIFY_DEL_DEVICE:
notify = vga_arbiter_del_pci_device(pdev);
if (notify)
vga_arbiter_notify_clients();
break;
case BUS_NOTIFY_BOUND_DRIVER:
vga_arbiter_do_arbitration(pdev);
break;
default:
break;
}
```Because we only need call vga_arbiter_notify_clients() when action == BUS_NOTIFY_ADD_DEVICE or action == BUS_NOTIFY_DEL_DEVICE,
But *NOT* when the action equals to BUS_NOTIFY_BOUND_DRIVER.
Hi,
Quoted 2 lines · Bjorn Helgaas
"drm/loongson: Add an implement for ..." also solves a problem, but it lacks a commit log, so I don't know what the problem is.
I have already telling you one yeas ago.
I want remove the pci_fixup_vgadev() function in arch/loongarch/pci/pci.c
I was the original author of this workaround at our downstream kernel.
While the time is not mature until this patch set be merged.
I don't want mention this, as you asked this question.
So, I think I have to explain.
-static void pci_fixup_vgadev(struct pci_dev *pdev)
-{
- struct pci_dev *devp = NULL;
-
- while ((devp = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, devp))) {
- if (devp->vendor != PCI_VENDOR_ID_LOONGSON) {
- vga_set_default_device(devp);
- dev_info(&pdev->dev,
- "Overriding boot device as %X:%X\n",
- devp->vendor, devp->device);
- }
- }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_DC1, pci_fixup_vgadev); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_DC2, pci_fixup_vgadev);
Quoted 8 lines · suijingfeng
Quoted 7 lines · Bjorn Helgaas
Quoted 7 lines
2) It does not take the PCI Bar may get relocated into consideration.
3) It is not effective for the PCI device without a dedicated VRAM Bar.
4) It is device-agnostic, thus it has to waste the effort to iterate all of the PCI Bar to find the VRAM aperture.
5) It has invented lots of methods to determine which one is the default boot device, but this is still a policy because it doesn't give the user a choice to override.
Quoted 8 lines
Quoted 3 lines
I don't think we need a list of*potential* problems. We need an example of the specific problem this will solve, i.e., what currently does not work?
This version do allow the arbitration service works on non-x86 arch, which also allow me remove a arch-specific workaround.
I will give more detail at the next version.
Yes. This part I think we want.
Quoted 4 lines
But I want to provide one more drawback of vgaarb here:
(6) It does not works for non VGA-compatible PCI(e) display controllers.
Quoted 8 lines
Because, currently, vgaarb deal with PCI VGA compatible devices only.
See another my patch set [1] for more elaborate discussion.
It also ignore
PCI_CLASS_NOT_DEFINED_VGAas Maciej puts it[2].While my approach do not required the display controller to be VGA-compatible to enjoy the arbitration service.
I think vgaarb is really only for dealing with the problem of the legacy VGA address space routing. For example, there may be VGA devices that require the [pci 0xa0000-0xbffff] range but they don't describe that via a BAR. There may also be VGA option ROMs that depend on that range so they can initialize the device.
The [pci 0xa0000-0xbffff] range can only be routed to one device at a time, and vgaarb is what takes care of that by manipulating the VGA Enable bits in bridges.
I don't think we should extend vgaarb to deal with non-VGA GPUs in general, i.e., I don't think it should be concerned with devices and option ROMs that do not require the [pci 0xa0000-0xbffff] range.
I think a strict reading of the PCI Class Code spec would be that only devices with Programming Interface 0000 0000b can depend on that legacy range.
If that's what vgaarb currently enforces, great. If it currently deals with more than just 0000 0000b devices, and there's some value in restricting it to only 0000 0000b, we could try that, but I would suggest doing that in a tiny patch all by itself. Then if we trip over a problem, it's easy to bisect and revert it.
Quoted 5 lines · suijingfeng
Quoted 2 lines · Bjorn Helgaas
"drm/loongson: Add an implement for ..." also solves a problem, but it lacks a commit log, so I don't know what the problem is.
I have already telling you one yeas ago.
The patch itself must be self-contained, including a commit log that justifies the change. You may have told me a year ago, but that doesn't help somebody looking at these changes next year.
Bjorn