* [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-21 20:48 ` kernel test robot
2021-08-20 10:08 ` [PATCH V3 2/9] PCI/VGA: Replace full MIT license text with SPDX identifier Huacai Chen
` (8 subsequent siblings)
9 siblings, 1 reply; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen
From: Bjorn Helgaas <bhelgaas@google.com>
The VGA arbiter is really PCI-specific and doesn't depend on any GPU
things. Move it to the PCI subsystem.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/gpu/vga/Kconfig | 19 -------------------
drivers/gpu/vga/Makefile | 1 -
drivers/pci/Kconfig | 19 +++++++++++++++++++
drivers/pci/Makefile | 1 +
drivers/{gpu/vga => pci}/vgaarb.c | 0
5 files changed, 20 insertions(+), 20 deletions(-)
rename drivers/{gpu/vga => pci}/vgaarb.c (100%)
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 1ad4c4ef0b5e..eb8b14ab22c3 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -1,23 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-config VGA_ARB
- bool "VGA Arbitration" if EXPERT
- default y
- depends on (PCI && !S390)
- help
- Some "legacy" VGA devices implemented on PCI typically have the same
- hard-decoded addresses as they did on ISA. When multiple PCI devices
- are accessed at same time they need some kind of coordination. Please
- see Documentation/gpu/vgaarbiter.rst for more details. Select this to
- enable VGA arbiter.
-
-config VGA_ARB_MAX_GPUS
- int "Maximum number of GPUs"
- default 16
- depends on VGA_ARB
- help
- Reserves space in the kernel to maintain resource locking for
- multiple GPUS. The overhead for each GPU is very small.
-
config VGA_SWITCHEROO
bool "Laptop Hybrid Graphics - GPU switching support"
depends on X86
diff --git a/drivers/gpu/vga/Makefile b/drivers/gpu/vga/Makefile
index e92064442d60..9800620deda3 100644
--- a/drivers/gpu/vga/Makefile
+++ b/drivers/gpu/vga/Makefile
@@ -1,3 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VGA_ARB) += vgaarb.o
obj-$(CONFIG_VGA_SWITCHEROO) += vga_switcheroo.o
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 0c473d75e625..7c9e56d7b857 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -252,6 +252,25 @@ config PCIE_BUS_PEER2PEER
endchoice
+config VGA_ARB
+ bool "VGA Arbitration" if EXPERT
+ default y
+ depends on (PCI && !S390)
+ help
+ Some "legacy" VGA devices implemented on PCI typically have the same
+ hard-decoded addresses as they did on ISA. When multiple PCI devices
+ are accessed at same time they need some kind of coordination. Please
+ see Documentation/gpu/vgaarbiter.rst for more details. Select this to
+ enable VGA arbiter.
+
+config VGA_ARB_MAX_GPUS
+ int "Maximum number of GPUs"
+ default 16
+ depends on VGA_ARB
+ help
+ Reserves space in the kernel to maintain resource locking for
+ multiple GPUS. The overhead for each GPU is very small.
+
source "drivers/pci/hotplug/Kconfig"
source "drivers/pci/controller/Kconfig"
source "drivers/pci/endpoint/Kconfig"
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index d62c4ac4ae1b..ebe720f69b15 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_PCI_PF_STUB) += pci-pf-stub.o
obj-$(CONFIG_PCI_ECAM) += ecam.o
obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o
obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+obj-$(CONFIG_VGA_ARB) += vgaarb.o
# Endpoint library must be initialized before its users
obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/pci/vgaarb.c
similarity index 100%
rename from drivers/gpu/vga/vgaarb.c
rename to drivers/pci/vgaarb.c
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci
2021-08-20 10:08 ` [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
@ 2021-08-21 20:48 ` kernel test robot
0 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2021-08-21 20:48 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 30851 bytes --]
Hi Huacai,
I love your patch! Perhaps something to improve:
[auto build test WARNING on pci/next]
[also build test WARNING on linus/master v5.14-rc6 next-20210820]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Huacai-Chen/PCI-VGA-Rework-default-VGA-device-selection/20210820-181519
base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
config: arm-randconfig-c002-20210820 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project d9c5613e856cf2addfbf892fc4c1ce9ef9feceaa)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/5a499ac0123cbe13fba8e3216dc81cf09f59b101
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Huacai-Chen/PCI-VGA-Rework-default-VGA-device-selection/20210820-181519
git checkout 5a499ac0123cbe13fba8e3216dc81cf09f59b101
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm clang-analyzer
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
clang-analyzer warnings: (new ones prefixed by >>)
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:2214:6: note: Assuming 'flush' is 0
if (flush && pkt_flush_cache(pd))
^~~~~
drivers/block/pktcdvd.c:2214:12: note: Left side of '&&' is false
if (flush && pkt_flush_cache(pd))
^
drivers/block/pktcdvd.c:2219:2: note: Calling 'pkt_set_speed'
pkt_set_speed(pd, MAX_SPEED, MAX_SPEED);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:801:8: note: Calling 'pkt_generic_packet'
ret = pkt_generic_packet(pd, &cgc);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:706:27: note: Assuming field 'data_direction' is not equal to CGC_DATA_WRITE
rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:706:26: note: '?' condition is false
rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?
^
drivers/block/pktcdvd.c:708:2: note: Taking true branch
if (IS_ERR(rq))
^
drivers/block/pktcdvd.c:709:3: note: Returning without writing to 'cgc->sshdr', which participates in a condition later
return PTR_ERR(rq);
^
drivers/block/pktcdvd.c:801:8: note: Returning from 'pkt_generic_packet'
ret = pkt_generic_packet(pd, &cgc);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:802:6: note: 'ret' is not equal to 0
if (ret)
^~~
drivers/block/pktcdvd.c:802:2: note: Taking true branch
if (ret)
^
drivers/block/pktcdvd.c:803:3: note: Calling 'pkt_dump_sense'
pkt_dump_sense(pd, &cgc);
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/pktcdvd.c:753:6: note: 'sshdr' is non-null
if (sshdr)
^~~~~
drivers/block/pktcdvd.c:753:2: note: Taking true branch
if (sshdr)
^
drivers/block/pktcdvd.c:757:4: note: 1st function call argument is an uninitialized value
sense_key_string(sshdr->sense_key));
^
drivers/block/pktcdvd.c:76:33: note: expanded from macro 'pkt_err'
pr_err("%s: " fmt, pd->name, ##__VA_ARGS__)
^~~~~~~~~~~
include/linux/printk.h:390:33: note: expanded from macro 'pr_err'
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~~~~~~
drivers/block/pktcdvd.c:2723:2: warning: Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119 [clang-analyzer-security.insecureAPI.strcpy]
strcpy(disk->disk_name, pd->name);
^~~~~~
drivers/block/pktcdvd.c:2723:2: note: Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119
strcpy(disk->disk_name, pd->name);
^~~~~~
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
drivers/pci/ecam.c:62:2: warning: Value stored to 'bsz' is never read [clang-analyzer-deadcode.DeadStores]
bsz = 1 << bus_shift;
^ ~~~~~~~~~~~~~~
drivers/pci/ecam.c:62:2: note: Value stored to 'bsz' is never read
bsz = 1 << bus_shift;
^ ~~~~~~~~~~~~~~
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
4 warnings generated.
>> drivers/pci/vgaarb.c:245:17: warning: Value stored to 'dev' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
struct device *dev = &vgadev->pdev->dev;
^~~ ~~~~~~~~~~~~~~~~~~
drivers/pci/vgaarb.c:245:17: note: Value stored to 'dev' during its initialization is never read
struct device *dev = &vgadev->pdev->dev;
^~~ ~~~~~~~~~~~~~~~~~~
drivers/pci/vgaarb.c:394:17: warning: Value stored to 'dev' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
struct device *dev = &vgadev->pdev->dev;
^~~ ~~~~~~~~~~~~~~~~~~
drivers/pci/vgaarb.c:394:17: note: Value stored to 'dev' during its initialization is never read
struct device *dev = &vgadev->pdev->dev;
^~~ ~~~~~~~~~~~~~~~~~~
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
2 warnings generated.
Suppressed 2 warnings (2 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
4 warnings generated.
fs/fat/fatent.c:482:2: warning: Value stored to 'err' is never read [clang-analyzer-deadcode.DeadStores]
err = nr_bhs = idx_clus = 0;
^ ~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:482:2: note: Value stored to 'err' is never read
err = nr_bhs = idx_clus = 0;
^ ~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:684:18: warning: The left operand of '>=' is a garbage value [clang-analyzer-core.UndefinedBinaryOperatorResult]
if (ra->ra_next >= ra->ra_limit)
^
fs/fat/fatent.c:777:14: note: Assuming '__UNIQUE_ID___x254' is <= '__UNIQUE_ID___y255'
ent_start = max_t(u64, range->start>>sbi->cluster_bits, FAT_START_ENT);
^
include/linux/minmax.h:112:27: note: expanded from macro 'max_t'
#define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/minmax.h:38:3: note: expanded from macro '__careful_cmp'
__cmp_once(x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y), op))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/minmax.h:33:3: note: expanded from macro '__cmp_once'
__cmp(unique_x, unique_y, op); })
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/minmax.h:28:26: note: expanded from macro '__cmp'
#define __cmp(x, y, op) ((x) op (y) ? (x) : (y))
^~~~~~~~~~
fs/fat/fatent.c:777:14: note: '?' condition is false
ent_start = max_t(u64, range->start>>sbi->cluster_bits, FAT_START_ENT);
^
include/linux/minmax.h:112:27: note: expanded from macro 'max_t'
#define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >)
^
include/linux/minmax.h:38:3: note: expanded from macro '__careful_cmp'
__cmp_once(x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y), op))
^
include/linux/minmax.h:33:3: note: expanded from macro '__cmp_once'
__cmp(unique_x, unique_y, op); })
^
include/linux/minmax.h:28:26: note: expanded from macro '__cmp'
#define __cmp(x, y, op) ((x) op (y) ? (x) : (y))
^
fs/fat/fatent.c:781:6: note: Assuming 'ent_start' is < field 'max_cluster'
if (ent_start >= sbi->max_cluster || range->len < sbi->cluster_size)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:781:6: note: Left side of '||' is false
fs/fat/fatent.c:781:39: note: Assuming field 'len' is >= field 'cluster_size'
if (ent_start >= sbi->max_cluster || range->len < sbi->cluster_size)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:781:2: note: Taking false branch
if (ent_start >= sbi->max_cluster || range->len < sbi->cluster_size)
^
fs/fat/fatent.c:783:6: note: Assuming 'ent_end' is < field 'max_cluster'
if (ent_end >= sbi->max_cluster)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:783:2: note: Taking false branch
if (ent_end >= sbi->max_cluster)
^
fs/fat/fatent.c:789:2: note: Calling 'fat_ra_init'
fat_ra_init(sb, &fatent_ra, &fatent, ent_end + 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:660:6: note: Assuming 'ent_limit' is <= field 'entry'
if (fatent->entry >= ent_limit)
^~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:660:2: note: Taking true branch
if (fatent->entry >= ent_limit)
^
fs/fat/fatent.c:661:3: note: Returning without writing to 'ra->ra_next'
return;
^
fs/fat/fatent.c:789:2: note: Returning from 'fat_ra_init'
fat_ra_init(sb, &fatent_ra, &fatent, ent_end + 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:790:9: note: Assuming 'ent_end' is >= field 'entry'
while (fatent.entry <= ent_end) {
^~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:790:2: note: Loop condition is true. Entering loop body
while (fatent.entry <= ent_end) {
^
fs/fat/fatent.c:792:3: note: Calling 'fat_ent_reada'
fat_ent_reada(sb, &fatent_ra, &fatent);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/fat/fatent.c:684:18: note: The left operand of '>=' is a garbage value
if (ra->ra_next >= ra->ra_limit)
~~~~~~~~~~~ ^
Suppressed 2 warnings (2 in non-user code).
vim +/dev +245 drivers/pci/vgaarb.c
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 241
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 242 static struct vga_device *__vga_tryget(struct vga_device *vgadev,
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 243 unsigned int rsrc)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 244 {
a75d68f62106fe6 drivers/gpu/vga/vgaarb.c Bjorn Helgaas 2016-11-17 @245 struct device *dev = &vgadev->pdev->dev;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 246 unsigned int wants, legacy_wants, match;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 247 struct vga_device *conflict;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 248 unsigned int pci_bits;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 249 u32 flags = 0;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 250
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 251 /* Account for "normal" resources to lock. If we decode the legacy,
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 252 * counterpart, we need to request it as well
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 253 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 254 if ((rsrc & VGA_RSRC_NORMAL_IO) &&
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 255 (vgadev->decodes & VGA_RSRC_LEGACY_IO))
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 256 rsrc |= VGA_RSRC_LEGACY_IO;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 257 if ((rsrc & VGA_RSRC_NORMAL_MEM) &&
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 258 (vgadev->decodes & VGA_RSRC_LEGACY_MEM))
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 259 rsrc |= VGA_RSRC_LEGACY_MEM;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 260
a75d68f62106fe6 drivers/gpu/vga/vgaarb.c Bjorn Helgaas 2016-11-17 261 vgaarb_dbg(dev, "%s: %d\n", __func__, rsrc);
a75d68f62106fe6 drivers/gpu/vga/vgaarb.c Bjorn Helgaas 2016-11-17 262 vgaarb_dbg(dev, "%s: owns: %d\n", __func__, vgadev->owns);
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 263
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 264 /* Check what resources we need to acquire */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 265 wants = rsrc & ~vgadev->owns;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 266
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 267 /* We already own everything, just mark locked & bye bye */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 268 if (wants == 0)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 269 goto lock_them;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 270
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 271 /* We don't need to request a legacy resource, we just enable
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 272 * appropriate decoding and go
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 273 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 274 legacy_wants = wants & VGA_RSRC_LEGACY_MASK;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 275 if (legacy_wants == 0)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 276 goto enable_them;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 277
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 278 /* Ok, we don't, let's find out how we need to kick off */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 279 list_for_each_entry(conflict, &vga_list, list) {
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 280 unsigned int lwants = legacy_wants;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 281 unsigned int change_bridge = 0;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 282
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 283 /* Don't conflict with myself */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 284 if (vgadev == conflict)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 285 continue;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 286
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 287 /* Check if the architecture allows a conflict between those
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 288 * 2 devices or if they are on separate domains
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 289 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 290 if (!vga_conflicts(vgadev->pdev, conflict->pdev))
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 291 continue;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 292
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 293 /* We have a possible conflict. before we go further, we must
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 294 * check if we sit on the same bus as the conflicting device.
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 295 * if we don't, then we must tie both IO and MEM resources
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 296 * together since there is only a single bit controlling
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 297 * VGA forwarding on P2P bridges
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 298 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 299 if (vgadev->pdev->bus != conflict->pdev->bus) {
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 300 change_bridge = 1;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 301 lwants = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 302 }
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 303
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 304 /* Check if the guy has a lock on the resource. If he does,
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 305 * return the conflicting entry
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 306 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 307 if (conflict->locks & lwants)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 308 return conflict;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 309
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 310 /* Ok, now check if it owns the resource we want. We can
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 311 * lock resources that are not decoded, therefore a device
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 312 * can own resources it doesn't decode.
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 313 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 314 match = lwants & conflict->owns;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 315 if (!match)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 316 continue;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 317
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 318 /* looks like he doesn't have a lock, we can steal
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 319 * them from him
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 320 */
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 321
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 322 flags = 0;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 323 pci_bits = 0;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 324
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 325 /* If we can't control legacy resources via the bridge, we
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 326 * also need to disable normal decoding.
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 327 */
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 328 if (!conflict->bridge_has_one_vga) {
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 329 if ((match & conflict->decodes) & VGA_RSRC_LEGACY_MEM)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 330 pci_bits |= PCI_COMMAND_MEMORY;
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 331 if ((match & conflict->decodes) & VGA_RSRC_LEGACY_IO)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 332 pci_bits |= PCI_COMMAND_IO;
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 333
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 334 if (pci_bits) {
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 335 vga_irq_set_state(conflict, false);
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 336 flags |= PCI_VGA_STATE_CHANGE_DECODES;
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 337 }
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 338 }
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 339
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 340 if (change_bridge)
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 341 flags |= PCI_VGA_STATE_CHANGE_BRIDGE;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 342
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 343 pci_set_vga_state(conflict->pdev, false, pci_bits, flags);
f22d776f3e280e6 drivers/gpu/vga/vgaarb.c Alex Williamson 2013-08-15 344 conflict->owns &= ~match;
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 345
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 346 /* If we disabled normal decoding, reflect it in owns */
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 347 if (pci_bits & PCI_COMMAND_MEMORY)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 348 conflict->owns &= ~VGA_RSRC_NORMAL_MEM;
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 349 if (pci_bits & PCI_COMMAND_IO)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 350 conflict->owns &= ~VGA_RSRC_NORMAL_IO;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 351 }
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 352
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 353 enable_them:
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 354 /* ok dude, we got it, everybody conflicting has been disabled, let's
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 355 * enable us. Mark any bits in "owns" regardless of whether we
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 356 * decoded them. We can lock resources we don't decode, therefore
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 357 * we must track them via "owns".
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 358 */
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 359 flags = 0;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 360 pci_bits = 0;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 361
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 362 if (!vgadev->bridge_has_one_vga) {
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 363 flags |= PCI_VGA_STATE_CHANGE_DECODES;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 364 if (wants & (VGA_RSRC_LEGACY_MEM|VGA_RSRC_NORMAL_MEM))
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 365 pci_bits |= PCI_COMMAND_MEMORY;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 366 if (wants & (VGA_RSRC_LEGACY_IO|VGA_RSRC_NORMAL_IO))
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 367 pci_bits |= PCI_COMMAND_IO;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 368 }
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 369 if (wants & VGA_RSRC_LEGACY_MASK)
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 370 flags |= PCI_VGA_STATE_CHANGE_BRIDGE;
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 371
3448a19da479b6b drivers/gpu/vga/vgaarb.c Dave Airlie 2010-06-01 372 pci_set_vga_state(vgadev->pdev, true, pci_bits, flags);
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 373
5d90ccf908bd806 drivers/gpu/vga/vgaarb.c Thierry Reding 2015-08-12 374 if (!vgadev->bridge_has_one_vga)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 375 vga_irq_set_state(vgadev, true);
5d90ccf908bd806 drivers/gpu/vga/vgaarb.c Thierry Reding 2015-08-12 376
4e4e7dc55af5aa6 drivers/gpu/vga/vgaarb.c Alex Williamson 2014-07-03 377 vgadev->owns |= wants;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 378 lock_them:
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 379 vgadev->locks |= (rsrc & VGA_RSRC_LEGACY_MASK);
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 380 if (rsrc & VGA_RSRC_LEGACY_IO)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 381 vgadev->io_lock_cnt++;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 382 if (rsrc & VGA_RSRC_LEGACY_MEM)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 383 vgadev->mem_lock_cnt++;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 384 if (rsrc & VGA_RSRC_NORMAL_IO)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 385 vgadev->io_norm_cnt++;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 386 if (rsrc & VGA_RSRC_NORMAL_MEM)
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 387 vgadev->mem_norm_cnt++;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 388
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 389 return NULL;
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 390 }
deb2d2ecd43dfc5 drivers/gpu/vga/vgaarb.c Benjamin Herrenschmidt 2009-08-11 391
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 33048 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH V3 2/9] PCI/VGA: Replace full MIT license text with SPDX identifier
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-20 10:08 ` [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 3/9] PCI/VGA: Use unsigned format string to print lock counts Huacai Chen
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen
From: Bjorn Helgaas <bhelgaas@google.com>
Per Documentation/process/license-rules.rst, the SPDX MIT identifier is
equivalent to including the entire MIT license text from
LICENSES/preferred/MIT.
Replace the MIT license text with the equivalent SPDX identifier.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 949fde433ea2..61b57abcb014 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -1,32 +1,11 @@
+// SPDX-License-Identifier: MIT
/*
* vgaarb.c: Implements the VGA arbitration. For details refer to
* Documentation/gpu/vgaarbiter.rst
*
- *
* (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org>
* (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com>
* (C) Copyright 2007, 2009 Tiago Vignatti <vignatti@freedesktop.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS
- * IN THE SOFTWARE.
- *
*/
#define pr_fmt(fmt) "vgaarb: " fmt
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 3/9] PCI/VGA: Use unsigned format string to print lock counts
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-20 10:08 ` [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
2021-08-20 10:08 ` [PATCH V3 2/9] PCI/VGA: Replace full MIT license text with SPDX identifier Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 4/9] PCI/VGA: Remove empty vga_arb_device_card_gone() Huacai Chen
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen
From: Bjorn Helgaas <bhelgaas@google.com>
In struct vga_device, io_lock_cnt and mem_lock_cnt are unsigned, but we
previously printed them with "%d", the signed decimal format. Print them
with the unsigned format "%u" instead.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 61b57abcb014..e4153ab70481 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -1022,7 +1022,7 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
/* Fill the buffer with infos */
len = snprintf(lbuf, 1024,
- "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s(%d:%d)\n",
+ "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s(%u:%u)\n",
vga_decode_count, pci_name(pdev),
vga_iostate_to_str(vgadev->decodes),
vga_iostate_to_str(vgadev->owns),
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 4/9] PCI/VGA: Remove empty vga_arb_device_card_gone()
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (2 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 3/9] PCI/VGA: Use unsigned format string to print lock counts Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 5/9] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Huacai Chen
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen
From: Bjorn Helgaas <bhelgaas@google.com>
vga_arb_device_card_gone() has always been empty. Remove it.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index e4153ab70481..c984c76b3fd7 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -104,8 +104,6 @@ static int vga_str_to_iostate(char *buf, int str_size, int *io_state)
/* this is only used a cookie - it should not be dereferenced */
static struct pci_dev *vga_default;
-static void vga_arb_device_card_gone(struct pci_dev *pdev);
-
/* Find somebody in our list */
static struct vga_device *vgadev_find(struct pci_dev *pdev)
{
@@ -741,10 +739,6 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
/* Remove entry from list */
list_del(&vgadev->list);
vga_count--;
- /* Notify userland driver that the device is gone so it discards
- * it's copies of the pci_dev pointer
- */
- vga_arb_device_card_gone(pdev);
/* Wake up all possible waiters */
wake_up_all(&vga_wait_queue);
@@ -994,9 +988,7 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
if (lbuf == NULL)
return -ENOMEM;
- /* Shields against vga_arb_device_card_gone (pci_dev going
- * away), and allows access to vga list
- */
+ /* Protects vga_list */
spin_lock_irqsave(&vga_lock, flags);
/* If we are targeting the default, use it */
@@ -1013,8 +1005,6 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
/* Wow, it's not in the list, that shouldn't happen,
* let's fix us up and return invalid card
*/
- if (pdev == priv->target)
- vga_arb_device_card_gone(pdev);
spin_unlock_irqrestore(&vga_lock, flags);
len = sprintf(lbuf, "invalid");
goto done;
@@ -1358,10 +1348,6 @@ static int vga_arb_release(struct inode *inode, struct file *file)
return 0;
}
-static void vga_arb_device_card_gone(struct pci_dev *pdev)
-{
-}
-
/*
* callback any registered clients to let them know we have a
* change in VGA cards
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 5/9] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (3 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 4/9] PCI/VGA: Remove empty vga_arb_device_card_gone() Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 6/9] PCI/VGA: Prefer vga_default_device() Huacai Chen
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen, Huacai Chen
Move vga_arb_integrated_gpu() earlier in file to prepare for future patch.
No functional change intended.
[bhelgaas: split to separate patch]
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index c984c76b3fd7..1f8fb37be5fa 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -563,6 +563,20 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc)
}
EXPORT_SYMBOL(vga_put);
+#if defined(CONFIG_ACPI)
+static bool vga_arb_integrated_gpu(struct device *dev)
+{
+ struct acpi_device *adev = ACPI_COMPANION(dev);
+
+ return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);
+}
+#else
+static bool vga_arb_integrated_gpu(struct device *dev)
+{
+ return false;
+}
+#endif
+
/*
* Rules for using a bridge to control a VGA descendant decoding: if a bridge
* has only one VGA descendant then it can be used to control the VGA routing
@@ -1416,20 +1430,6 @@ static struct miscdevice vga_arb_device = {
MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
};
-#if defined(CONFIG_ACPI)
-static bool vga_arb_integrated_gpu(struct device *dev)
-{
- struct acpi_device *adev = ACPI_COMPANION(dev);
-
- return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);
-}
-#else
-static bool vga_arb_integrated_gpu(struct device *dev)
-{
- return false;
-}
-#endif
-
static void __init vga_arb_select_default_device(void)
{
struct pci_dev *pdev, *found = NULL;
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 6/9] PCI/VGA: Prefer vga_default_device()
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (4 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 5/9] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 7/9] PCI/VGA: Split out vga_arb_update_default_device() Huacai Chen
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen, Huacai Chen
Use the vga_default_device() interface consistently instead of directly
testing vga_default. No functional change intended.
[bhelgaas: split to separate patch and extended]
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 1f8fb37be5fa..a6a5864ff538 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -173,7 +173,7 @@ int vga_remove_vgacon(struct pci_dev *pdev)
{
int ret = 0;
- if (pdev != vga_default)
+ if (pdev != vga_default_device())
return 0;
vgaarb_info(&pdev->dev, "deactivate vga console\n");
@@ -707,7 +707,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
/* Deal with VGA default device. Use first enabled one
* by default if arch doesn't have it's own hook
*/
- if (vga_default == NULL &&
+ if (!vga_default_device() &&
((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
vgaarb_info(&pdev->dev, "setting as boot VGA device\n");
vga_set_default_device(pdev);
@@ -744,7 +744,7 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
goto bail;
}
- if (vga_default == pdev)
+ if (vga_default_device() == pdev)
vga_set_default_device(NULL);
if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 7/9] PCI/VGA: Split out vga_arb_update_default_device()
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (5 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 6/9] PCI/VGA: Prefer vga_default_device() Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 8/9] PCI/VGA: Log bridge control messages when adding devices Huacai Chen
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen, Huacai Chen
If there's no default VGA device, and we find a VGA device that owns the
legacy VGA resources, we make that device the default. Split this logic
out from vga_arbiter_add_pci_device() into a new function,
vga_arb_update_default_device().
[bhelgaas: split another piece to separate patch]
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index a6a5864ff538..4cecb599f5ed 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -577,6 +577,21 @@ static bool vga_arb_integrated_gpu(struct device *dev)
}
#endif
+static void vga_arb_update_default_device(struct vga_device *vgadev)
+{
+ struct pci_dev *pdev = vgadev->pdev;
+
+ /*
+ * If we don't have a default VGA device yet, and this device owns
+ * the legacy VGA resources, make it the default.
+ */
+ if (!vga_default_device() &&
+ ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
+ vgaarb_info(&pdev->dev, "setting as boot VGA device\n");
+ vga_set_default_device(pdev);
+ }
+}
+
/*
* Rules for using a bridge to control a VGA descendant decoding: if a bridge
* has only one VGA descendant then it can be used to control the VGA routing
@@ -704,15 +719,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
bus = bus->parent;
}
- /* Deal with VGA default device. Use first enabled one
- * by default if arch doesn't have it's own hook
- */
- if (!vga_default_device() &&
- ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
- vgaarb_info(&pdev->dev, "setting as boot VGA device\n");
- vga_set_default_device(pdev);
- }
-
+ vga_arb_update_default_device(vgadev);
vga_arbiter_check_bridge_sharing(vgadev);
/* Add to the list */
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 8/9] PCI/VGA: Log bridge control messages when adding devices
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (6 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 7/9] PCI/VGA: Split out vga_arb_update_default_device() Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-20 10:08 ` [PATCH V3 9/9] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-25 20:17 ` [PATCH V3 0/9] " Bjorn Helgaas
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen, Huacai Chen
Previously vga_arb_device_init() iterated through all VGA devices and
indicated whether legacy VGA routing to each could be controlled by an
upstream bridge.
But we determine that information in vga_arbiter_add_pci_device(), which we
call for every device, so we can log it there without iterating through the
VGA devices again.
Note that we call vga_arbiter_check_bridge_sharing() before adding the
device to vga_list, so we have to handle the very first device separately.
[bhelgaas: commit log, split another piece to separate patch, fix
list_empty() issue]
Link: https://lore.kernel.org/r/20210705100503.1120643-1-chenhuacai@loongson.cn
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 4cecb599f5ed..dd07b1c3205f 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -609,8 +609,10 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
vgadev->bridge_has_one_vga = true;
- if (list_empty(&vga_list))
+ if (list_empty(&vga_list)) {
+ vgaarb_info(&vgadev->pdev->dev, "bridge control possible\n");
return;
+ }
/* okay iterate the new devices bridge hierarachy */
new_bus = vgadev->pdev->bus;
@@ -649,6 +651,11 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
}
new_bus = new_bus->parent;
}
+
+ if (vgadev->bridge_has_one_vga)
+ vgaarb_info(&vgadev->pdev->dev, "bridge control possible\n");
+ else
+ vgaarb_info(&vgadev->pdev->dev, "no bridge control possible\n");
}
/*
@@ -1527,7 +1534,6 @@ static int __init vga_arb_device_init(void)
{
int rc;
struct pci_dev *pdev;
- struct vga_device *vgadev;
rc = misc_register(&vga_arb_device);
if (rc < 0)
@@ -1543,15 +1549,6 @@ static int __init vga_arb_device_init(void)
PCI_ANY_ID, pdev)) != NULL)
vga_arbiter_add_pci_device(pdev);
- list_for_each_entry(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
-
- if (vgadev->bridge_has_one_vga)
- vgaarb_info(dev, "bridge control possible\n");
- else
- vgaarb_info(dev, "no bridge control possible\n");
- }
-
vga_arb_select_default_device();
pr_info("loaded\n");
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH V3 9/9] PCI/VGA: Rework default VGA device selection
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (7 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 8/9] PCI/VGA: Log bridge control messages when adding devices Huacai Chen
@ 2021-08-20 10:08 ` Huacai Chen
2021-08-25 20:17 ` [PATCH V3 0/9] " Bjorn Helgaas
9 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-20 10:08 UTC (permalink / raw)
To: David Airlie, Daniel Vetter, Bjorn Helgaas
Cc: linux-pci, dri-devel, Xuefeng Li, Huacai Chen, Huacai Chen
Current default VGA device selection fails in some cases:
- On BMC system, the AST2500 bridge [1a03:1150] does not implement
PCI_BRIDGE_CTL_VGA [1]. This is perfectly legal but means the
legacy VGA resources won't reach downstream devices unless they're
included in the usual bridge windows.
- vga_arb_select_default_device() will set a device below such a
bridge as the default VGA device as long as it has PCI_COMMAND_IO
and PCI_COMMAND_MEMORY enabled.
- vga_arbiter_add_pci_device() is called for every VGA device,
either at boot-time or at hot-add time, and it will also set the
device as the default VGA device, but ONLY if all bridges leading
to it implement PCI_BRIDGE_CTL_VGA.
- This difference between vga_arb_select_default_device() and
vga_arbiter_add_pci_device() means that a device below an AST2500
or similar bridge can only be set as the default if it is
enumerated before vga_arb_device_init().
- On ACPI-based systems, PCI devices are enumerated by acpi_init(),
which runs before vga_arb_device_init().
- On non-ACPI systems, like on MIPS system, they are enumerated by
pcibios_init(), which typically runs *after*
vga_arb_device_init().
So I made vga_arb_update_default_device() to replace the current vga_
arb_select_default_device(), which will be call from vga_arbiter_add_
pci_device(), set the default device even if it does not own the VGA
resources because an upstream bridge doesn't implement PCI_BRIDGE_CTL_
VGA. And the default VGA device is updated if a better one is found
(device with legacy resources enabled is better, device owns the
firmware framebuffer is even better).
---
drivers/pci/vgaarb.c | 158 ++++++++++++++++++-------------------------
1 file changed, 66 insertions(+), 92 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index dd07b1c3205f..0b059a2fc749 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -580,16 +580,79 @@ static bool vga_arb_integrated_gpu(struct device *dev)
static void vga_arb_update_default_device(struct vga_device *vgadev)
{
struct pci_dev *pdev = vgadev->pdev;
+ struct device *dev = &pdev->dev;
+ struct vga_device *vgadev_default;
+#if defined(CONFIG_X86) || defined(CONFIG_IA64)
+ int i;
+ unsigned long flags;
+ u64 base = screen_info.lfb_base;
+ u64 size = screen_info.lfb_size;
+ u64 limit;
+ resource_size_t start, end;
+#endif
/*
* If we don't have a default VGA device yet, and this device owns
* the legacy VGA resources, make it the default.
*/
- if (!vga_default_device() &&
- ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
- vgaarb_info(&pdev->dev, "setting as boot VGA device\n");
+ if (!vga_default_device()) {
+ if ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)
+ vgaarb_info(dev, "setting as boot VGA device\n");
+ else
+ vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
vga_set_default_device(pdev);
}
+
+ vgadev_default = vgadev_find(vga_default);
+
+ /* Overridden by a better device */
+ if (vgadev_default && ((vgadev_default->owns & VGA_RSRC_LEGACY_MASK) == 0)
+ && ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
+ vgaarb_info(dev, "overriding boot VGA device\n");
+ vga_set_default_device(pdev);
+ }
+
+ if (vga_arb_integrated_gpu(dev)) {
+ vgaarb_info(dev, "overriding boot VGA device\n");
+ vga_set_default_device(pdev);
+ }
+
+#if defined(CONFIG_X86) || defined(CONFIG_IA64)
+ if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+ base |= (u64)screen_info.ext_lfb_base << 32;
+
+ limit = base + size;
+
+ /*
+ * Override vga_arbiter_add_pci_device()'s I/O based detection
+ * as it may take the wrong device (e.g. on Apple system under
+ * EFI).
+ *
+ * Select the device owning the boot framebuffer if there is
+ * one.
+ */
+
+ /* Does firmware framebuffer belong to us? */
+ for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+ flags = pci_resource_flags(vgadev->pdev, i);
+
+ if ((flags & IORESOURCE_MEM) == 0)
+ continue;
+
+ start = pci_resource_start(vgadev->pdev, i);
+ end = pci_resource_end(vgadev->pdev, i);
+
+ if (!start || !end)
+ continue;
+
+ if (base < start || limit >= end)
+ continue;
+
+ if (vgadev->pdev != vga_default_device())
+ vgaarb_info(dev, "overriding boot device\n");
+ vga_set_default_device(vgadev->pdev);
+ }
+#endif
}
/*
@@ -1444,92 +1507,6 @@ static struct miscdevice vga_arb_device = {
MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
};
-static void __init vga_arb_select_default_device(void)
-{
- struct pci_dev *pdev, *found = NULL;
- struct vga_device *vgadev;
-
-#if defined(CONFIG_X86) || defined(CONFIG_IA64)
- u64 base = screen_info.lfb_base;
- u64 size = screen_info.lfb_size;
- u64 limit;
- resource_size_t start, end;
- unsigned long flags;
- int i;
-
- if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
- base |= (u64)screen_info.ext_lfb_base << 32;
-
- limit = base + size;
-
- list_for_each_entry(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
- /*
- * Override vga_arbiter_add_pci_device()'s I/O based detection
- * as it may take the wrong device (e.g. on Apple system under
- * EFI).
- *
- * Select the device owning the boot framebuffer if there is
- * one.
- */
-
- /* Does firmware framebuffer belong to us? */
- for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
- flags = pci_resource_flags(vgadev->pdev, i);
-
- if ((flags & IORESOURCE_MEM) == 0)
- continue;
-
- start = pci_resource_start(vgadev->pdev, i);
- end = pci_resource_end(vgadev->pdev, i);
-
- if (!start || !end)
- continue;
-
- if (base < start || limit >= end)
- continue;
-
- if (!vga_default_device())
- vgaarb_info(dev, "setting as boot device\n");
- else if (vgadev->pdev != vga_default_device())
- vgaarb_info(dev, "overriding boot device\n");
- vga_set_default_device(vgadev->pdev);
- }
- }
-#endif
-
- if (!vga_default_device()) {
- list_for_each_entry_reverse(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
- u16 cmd;
-
- pdev = vgadev->pdev;
- pci_read_config_word(pdev, PCI_COMMAND, &cmd);
- if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
- found = pdev;
- if (vga_arb_integrated_gpu(dev))
- break;
- }
- }
- }
-
- if (found) {
- vgaarb_info(&found->dev, "setting as boot device (VGA legacy resources not available)\n");
- vga_set_default_device(found);
- return;
- }
-
- if (!vga_default_device()) {
- vgadev = list_first_entry_or_null(&vga_list,
- struct vga_device, list);
- if (vgadev) {
- struct device *dev = &vgadev->pdev->dev;
- vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
- vga_set_default_device(vgadev->pdev);
- }
- }
-}
-
static int __init vga_arb_device_init(void)
{
int rc;
@@ -1549,9 +1526,6 @@ static int __init vga_arb_device_init(void)
PCI_ANY_ID, pdev)) != NULL)
vga_arbiter_add_pci_device(pdev);
- vga_arb_select_default_device();
-
- pr_info("loaded\n");
return rc;
}
subsys_initcall(vga_arb_device_init);
--
2.27.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
` (8 preceding siblings ...)
2021-08-20 10:08 ` [PATCH V3 9/9] PCI/VGA: Rework default VGA device selection Huacai Chen
@ 2021-08-25 20:17 ` Bjorn Helgaas
2021-08-27 4:24 ` Huacai Chen
9 siblings, 1 reply; 14+ messages in thread
From: Bjorn Helgaas @ 2021-08-25 20:17 UTC (permalink / raw)
To: Huacai Chen
Cc: David Airlie, Daniel Vetter, Bjorn Helgaas, linux-pci, dri-devel,
Xuefeng Li, Huacai Chen
On Fri, Aug 20, 2021 at 06:08:23PM +0800, Huacai Chen wrote:
> My original work is at [1].
>
> Bjorn do some rework and extension in V2. It moves the VGA arbiter to
> the PCI subsystem, fixes a few nits, and breaks a few pieces to make
> the main patch a little smaller.
>
> V3 rewrite the commit log of the last patch (which is also summarized
> by Bjorn).
>
> All comments welcome!
>
> [1] https://lore.kernel.org/dri-devel/20210705100503.1120643-1-chenhuacai@loongson.cn/
>
> Bjorn Helgaas (4):
> PCI/VGA: Move vgaarb to drivers/pci
> PCI/VGA: Replace full MIT license text with SPDX identifier
> PCI/VGA: Use unsigned format string to print lock counts
> PCI/VGA: Remove empty vga_arb_device_card_gone()
>
> Huacai Chen (5):
> PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
> PCI/VGA: Prefer vga_default_device()
> PCI/VGA: Split out vga_arb_update_default_device()
> PCI/VGA: Log bridge control messages when adding devices
> PCI/VGA: Rework default VGA device selection
>
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/gpu/vga/Kconfig | 19 ---
> drivers/gpu/vga/Makefile | 1 -
> drivers/pci/Kconfig | 19 +++
> drivers/pci/Makefile | 1 +
> drivers/{gpu/vga => pci}/vgaarb.c | 269 ++++++++++++------------------
> 5 files changed, 126 insertions(+), 183 deletions(-)
> rename drivers/{gpu/vga => pci}/vgaarb.c (90%)
I'm open to merging this series but the v5.15 merge window will
probably open on Sunday, and that's too close for a series of this
size.
Moreover, the critical change is still buried in the middle of the
last patch ("PCI/VGA: Rework default VGA device selection"). There's
way too much going on in that single patch.
As I mentioned in [1], I think you can make a 1- or 2-line patch that
will fix your problem, and I think *that's* the first thing we should
do.
That would be a patch against drivers/gpu/vga/vgaarb.c, so it would be
up to the DRM folks to decide whether to take it for v5.15, but at
least it would be small enough to review it easily.
Bjorn
[1] https://lore.kernel.org/r/20210724001043.GA448782@bjorn-Precision-5520
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection
2021-08-25 20:17 ` [PATCH V3 0/9] " Bjorn Helgaas
@ 2021-08-27 4:24 ` Huacai Chen
0 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-27 4:24 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Huacai Chen, David Airlie, Daniel Vetter, Bjorn Helgaas,
linux-pci, Maling list - DRI developers, Xuefeng Li
Hi, Bjorn,
On Thu, Aug 26, 2021 at 4:17 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Fri, Aug 20, 2021 at 06:08:23PM +0800, Huacai Chen wrote:
> > My original work is at [1].
> >
> > Bjorn do some rework and extension in V2. It moves the VGA arbiter to
> > the PCI subsystem, fixes a few nits, and breaks a few pieces to make
> > the main patch a little smaller.
> >
> > V3 rewrite the commit log of the last patch (which is also summarized
> > by Bjorn).
> >
> > All comments welcome!
> >
> > [1] https://lore.kernel.org/dri-devel/20210705100503.1120643-1-chenhuacai@loongson.cn/
> >
> > Bjorn Helgaas (4):
> > PCI/VGA: Move vgaarb to drivers/pci
> > PCI/VGA: Replace full MIT license text with SPDX identifier
> > PCI/VGA: Use unsigned format string to print lock counts
> > PCI/VGA: Remove empty vga_arb_device_card_gone()
> >
> > Huacai Chen (5):
> > PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
> > PCI/VGA: Prefer vga_default_device()
> > PCI/VGA: Split out vga_arb_update_default_device()
> > PCI/VGA: Log bridge control messages when adding devices
> > PCI/VGA: Rework default VGA device selection
> >
> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> > ---
> > drivers/gpu/vga/Kconfig | 19 ---
> > drivers/gpu/vga/Makefile | 1 -
> > drivers/pci/Kconfig | 19 +++
> > drivers/pci/Makefile | 1 +
> > drivers/{gpu/vga => pci}/vgaarb.c | 269 ++++++++++++------------------
> > 5 files changed, 126 insertions(+), 183 deletions(-)
> > rename drivers/{gpu/vga => pci}/vgaarb.c (90%)
>
> I'm open to merging this series but the v5.15 merge window will
> probably open on Sunday, and that's too close for a series of this
> size.
>
> Moreover, the critical change is still buried in the middle of the
> last patch ("PCI/VGA: Rework default VGA device selection"). There's
> way too much going on in that single patch.
>
> As I mentioned in [1], I think you can make a 1- or 2-line patch that
> will fix your problem, and I think *that's* the first thing we should
> do.
>
> That would be a patch against drivers/gpu/vga/vgaarb.c, so it would be
> up to the DRM folks to decide whether to take it for v5.15, but at
> least it would be small enough to review it easily.
OK, let me try.
Huacai
>
> Bjorn
>
> [1] https://lore.kernel.org/r/20210724001043.GA448782@bjorn-Precision-5520
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection
@ 2021-08-27 4:24 ` Huacai Chen
0 siblings, 0 replies; 14+ messages in thread
From: Huacai Chen @ 2021-08-27 4:24 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Huacai Chen, David Airlie, Daniel Vetter, Bjorn Helgaas,
linux-pci, Maling list - DRI developers, Xuefeng Li
Hi, Bjorn,
On Thu, Aug 26, 2021 at 4:17 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Fri, Aug 20, 2021 at 06:08:23PM +0800, Huacai Chen wrote:
> > My original work is at [1].
> >
> > Bjorn do some rework and extension in V2. It moves the VGA arbiter to
> > the PCI subsystem, fixes a few nits, and breaks a few pieces to make
> > the main patch a little smaller.
> >
> > V3 rewrite the commit log of the last patch (which is also summarized
> > by Bjorn).
> >
> > All comments welcome!
> >
> > [1] https://lore.kernel.org/dri-devel/20210705100503.1120643-1-chenhuacai@loongson.cn/
> >
> > Bjorn Helgaas (4):
> > PCI/VGA: Move vgaarb to drivers/pci
> > PCI/VGA: Replace full MIT license text with SPDX identifier
> > PCI/VGA: Use unsigned format string to print lock counts
> > PCI/VGA: Remove empty vga_arb_device_card_gone()
> >
> > Huacai Chen (5):
> > PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
> > PCI/VGA: Prefer vga_default_device()
> > PCI/VGA: Split out vga_arb_update_default_device()
> > PCI/VGA: Log bridge control messages when adding devices
> > PCI/VGA: Rework default VGA device selection
> >
> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> > ---
> > drivers/gpu/vga/Kconfig | 19 ---
> > drivers/gpu/vga/Makefile | 1 -
> > drivers/pci/Kconfig | 19 +++
> > drivers/pci/Makefile | 1 +
> > drivers/{gpu/vga => pci}/vgaarb.c | 269 ++++++++++++------------------
> > 5 files changed, 126 insertions(+), 183 deletions(-)
> > rename drivers/{gpu/vga => pci}/vgaarb.c (90%)
>
> I'm open to merging this series but the v5.15 merge window will
> probably open on Sunday, and that's too close for a series of this
> size.
>
> Moreover, the critical change is still buried in the middle of the
> last patch ("PCI/VGA: Rework default VGA device selection"). There's
> way too much going on in that single patch.
>
> As I mentioned in [1], I think you can make a 1- or 2-line patch that
> will fix your problem, and I think *that's* the first thing we should
> do.
>
> That would be a patch against drivers/gpu/vga/vgaarb.c, so it would be
> up to the DRM folks to decide whether to take it for v5.15, but at
> least it would be small enough to review it easily.
OK, let me try.
Huacai
>
> Bjorn
>
> [1] https://lore.kernel.org/r/20210724001043.GA448782@bjorn-Precision-5520
^ permalink raw reply [flat|nested] 14+ messages in thread