Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/gmch: switch to use pci_bus_{read,write}_config_word()
Switch to use pci_bus_{read,write}_config_word(), and stop using
i915->gmch.pdev reference for the bridge.
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/5c432540e254108bf73dbdec347d69ad87682fc9.1763578288.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+3
-2
+3
-2
drivers/gpu/drm/i915/soc/intel_gmch.c
+3
-2
drivers/gpu/drm/i915/soc/intel_gmch.c
···
18
18
int intel_gmch_vga_set_state(struct drm_i915_private *i915, bool enable_decode)
19
19
{
20
20
struct intel_display *display = i915->display;
21
+
struct pci_dev *pdev = to_pci_dev(display->drm->dev);
21
22
unsigned int reg = DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;
22
23
u16 gmch_ctrl;
23
24
24
-
if (pci_read_config_word(i915->gmch.pdev, reg, &gmch_ctrl)) {
25
+
if (pci_bus_read_config_word(pdev->bus, PCI_DEVFN(0, 0), reg, &gmch_ctrl)) {
25
26
drm_err(&i915->drm, "failed to read control word\n");
26
27
return -EIO;
27
28
}
···
35
34
else
36
35
gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
37
36
38
-
if (pci_write_config_word(i915->gmch.pdev, reg, gmch_ctrl)) {
37
+
if (pci_bus_write_config_word(pdev->bus, PCI_DEVFN(0, 0), reg, gmch_ctrl)) {
39
38
drm_err(&i915->drm, "failed to write control word\n");
40
39
return -EIO;
41
40
}