diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 16:54:52 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 17:04:00 +0300 |
| commit | 9cf26c8968b358bb14cc078f8153300a493613d4 (patch) | |
| tree | cb560226137022539f1ddaa9292f64a35ea5f736 /drivers/gpu/drm/mgag200 | |
| parent | d4a3e50ffd9084e3eafb318e95ca91b5895a6e62 (diff) | |
| parent | 2bc7ea71a73747a77e7f83bc085b0d2393235410 (diff) | |
| download | linux-9cf26c8968b358bb14cc078f8153300a493613d4.tar.xz | |
Merge drm/drm-next into drm-misc-next
Backmerging to pick up fixes from amdgpu.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/mgag200')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index d1e5933a6471..4d38b8e18030 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -28,12 +28,6 @@ int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2) struct device *dev = &pdev->dev; int err; - err = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option); - if (err != PCIBIOS_SUCCESSFUL) { - dev_err(dev, "pci_read_config_dword(PCI_MGA_OPTION) failed: %d\n", err); - return pcibios_err_to_errno(err); - } - err = pci_write_config_dword(pdev, PCI_MGA_OPTION, option); if (err != PCIBIOS_SUCCESSFUL) { dev_err(dev, "pci_write_config_dword(PCI_MGA_OPTION) failed: %d\n", err); |