diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-07-15 15:35:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-15 15:35:33 +1000 |
| commit | 891ce1c9623f36194587d02774ac3d8c30c3ca72 (patch) | |
| tree | cb0b0f76cd5d71603ce28331c98d0efc1aac2248 /drivers/gpu | |
| parent | 60693e3a38903e39e4fac0a9849b698fc36228bd (diff) | |
| parent | 7d09c7606346db9a48b62b4e02454a6b8f323043 (diff) | |
| download | linux-891ce1c9623f36194587d02774ac3d8c30c3ca72.tar.gz linux-891ce1c9623f36194587d02774ac3d8c30c3ca72.tar.bz2 linux-891ce1c9623f36194587d02774ac3d8c30c3ca72.zip | |
Merge tag 'drm-misc-next-fixes-2022-07-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes:
- dma-buf: revert change to fence handling
- mgag200: fix PCI register initialization
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YtAjgcWC1zkNOGWa@linux-uq9g
Diffstat (limited to 'drivers/gpu')
| -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 73e8e4e9e54b..251a1bb648cc 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); |