From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
intel-gfx@lists.freedesktop.org,
Sinan Kaya <okaya@codeaurora.org>,
Antonino Daplas <adaplas@gmail.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
linux-fbdev@vger.kernel.org (open list:NVIDIA (rivafb and
nvidiafb) FRAMEBUFFER DRIVER),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH V3 26/29] video: fbdev: nvidia: deprecate pci_get_bus_and_slot()
Date: Mon, 27 Nov 2017 11:58:03 -0500 [thread overview]
Message-ID: <1511801886-6753-27-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org>
pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as
where a PCI device is present. This restricts the device drivers to be
reused for other domain numbers.
Getting ready to remove pci_get_bus_and_slot() function in favor of
pci_get_domain_bus_and_slot().
struct nvidia_par has a pointer to struct pci_dev. Use the pci_dev
member to extract the domain information and pass it to
pci_get_domain_bus_and_slot() function.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/video/fbdev/nvidia/nv_hw.c | 11 ++++++-----
drivers/video/fbdev/nvidia/nv_setup.c | 3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/nvidia/nv_hw.c b/drivers/video/fbdev/nvidia/nv_hw.c
index 81c80ac..8335da4 100644
--- a/drivers/video/fbdev/nvidia/nv_hw.c
+++ b/drivers/video/fbdev/nvidia/nv_hw.c
@@ -683,10 +683,11 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
nv10_sim_state sim_data;
unsigned int M, N, P, pll, MClk, NVClk, memctrl;
struct pci_dev *dev;
+ int domain = pci_domain_nr(par->pci_dev->bus);
if ((par->Chipset & 0x0FF0) == 0x01A0) {
unsigned int uMClkPostDiv;
- dev = pci_get_bus_and_slot(0, 3);
+ dev = pci_get_domain_bus_and_slot(domain, 0, 3);
pci_read_config_dword(dev, 0x6C, &uMClkPostDiv);
uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf;
@@ -694,7 +695,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
uMClkPostDiv = 4;
MClk = 400000 / uMClkPostDiv;
} else {
- dev = pci_get_bus_and_slot(0, 5);
+ dev = pci_get_domain_bus_and_slot(domain, 0, 5);
pci_read_config_dword(dev, 0x4c, &MClk);
MClk /= 1000;
}
@@ -707,13 +708,13 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
sim_data.pix_bpp = (char)pixelDepth;
sim_data.enable_video = 0;
sim_data.enable_mp = 0;
- dev = pci_get_bus_and_slot(0, 1);
+ dev = pci_get_domain_bus_and_slot(domain, 0, 1);
pci_read_config_dword(dev, 0x7C, &sim_data.memory_type);
pci_dev_put(dev);
sim_data.memory_type = (sim_data.memory_type >> 12) & 1;
sim_data.memory_width = 64;
- dev = pci_get_bus_and_slot(0, 3);
+ dev = pci_get_domain_bus_and_slot(domain, 0, 3);
pci_read_config_dword(dev, 0, &memctrl);
pci_dev_put(dev);
memctrl >>= 16;
@@ -721,7 +722,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
u32 dimm[3];
- dev = pci_get_bus_and_slot(0, 2);
+ dev = pci_get_domain_bus_and_slot(domain, 0, 2);
pci_read_config_dword(dev, 0x40, &dimm[0]);
dimm[0] = (dimm[0] >> 8) & 0x4f;
pci_read_config_dword(dev, 0x44, &dimm[1]);
diff --git a/drivers/video/fbdev/nvidia/nv_setup.c b/drivers/video/fbdev/nvidia/nv_setup.c
index 2f2e162..b17acd2 100644
--- a/drivers/video/fbdev/nvidia/nv_setup.c
+++ b/drivers/video/fbdev/nvidia/nv_setup.c
@@ -264,7 +264,8 @@ static void nv10GetConfig(struct nvidia_par *par)
}
#endif
- dev = pci_get_bus_and_slot(0, 1);
+ dev = pci_get_domain_bus_and_slot(pci_domain_nr(par->pci_dev->bus),
+ 0, 1);
if ((par->Chipset & 0xffff) == 0x01a0) {
u32 amt;
--
1.9.1
next prev parent reply other threads:[~2017-11-27 17:00 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1511801886-6753-1-git-send-email-okaya@codeaurora.org>
2017-11-27 16:57 ` [PATCH V3 01/29] alpha/PCI: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 02/29] powerpc/PCI: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 03/29] x86/PCI: " Sinan Kaya
2017-11-28 13:45 ` Thomas Gleixner
2017-11-27 16:57 ` [PATCH V3 04/29] ata: " Sinan Kaya
2017-11-27 19:50 ` Tejun Heo
2017-11-27 16:57 ` [PATCH V3 05/29] agp: nvidia: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 06/29] edd: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 07/29] ibft: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 08/29] drm/gma500: " Sinan Kaya
2017-11-27 18:49 ` Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 09/29] drm/i915: " Sinan Kaya
2017-11-27 18:50 ` Sinan Kaya
2017-12-12 14:04 ` Joonas Lahtinen
2017-12-13 0:07 ` Sinan Kaya
2017-12-13 8:01 ` Joonas Lahtinen
2017-11-28 15:30 ` [Intel-gfx] " Ville Syrjälä
2017-11-28 16:29 ` Sinan Kaya
2017-12-03 19:29 ` Sinan Kaya
2018-02-16 14:54 ` Bjorn Helgaas
2018-02-19 9:34 ` Jani Nikula
2018-02-19 9:47 ` Joonas Lahtinen
2017-11-27 16:57 ` [PATCH V3 10/29] drm/nouveau: " Sinan Kaya
2017-11-27 18:52 ` Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 11/29] Drivers: ide: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 12/29] iommu/amd: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 13/29] powerpc/powermac: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 14/29] bnx2x: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 15/29] pch_gbe: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 16/29] PCI: cpqhp: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 17/29] PCI: ibmphp: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 18/29] PCI/quirks: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 19/29] PCI/syscall: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 20/29] xen: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 21/29] openprom: " Sinan Kaya
2017-11-27 16:57 ` [PATCH V3 22/29] [media] atomisp: " Sinan Kaya
2017-11-29 8:36 ` Sakari Ailus
2017-11-27 16:58 ` [PATCH V3 23/29] staging: rts5208: remove rtsx_read_pci_cfg_byte() Sinan Kaya
2017-11-27 16:58 ` [PATCH V3 24/29] backlight: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-11-27 19:46 ` Jingoo Han
2017-11-28 8:13 ` Lee Jones
2017-11-27 16:58 ` [PATCH V3 25/29] video: fbdev: intelfb: " Sinan Kaya
2017-11-27 16:58 ` Sinan Kaya [this message]
2017-11-27 16:58 ` [PATCH V3 27/29] video: fbdev: riva: " Sinan Kaya
2017-11-27 16:58 ` [PATCH V3 28/29] i7300_idle: remove unused file Sinan Kaya
2017-11-27 16:58 ` [PATCH V3 29/29] PCI: remove pci_get_bus_and_slot() function Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1511801886-6753-27-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=adaplas@gmail.com \
--cc=b.zolnierkie@samsung.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=timur@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).