diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma-buf/dma-fence-unwrap.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/dma-buf/dma-fence-unwrap.c b/drivers/dma-buf/dma-fence-unwrap.c index 502a65ea6d44..7002bca792ff 100644 --- a/drivers/dma-buf/dma-fence-unwrap.c +++ b/drivers/dma-buf/dma-fence-unwrap.c @@ -72,7 +72,8 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, count = 0; for (i = 0; i < num_fences; ++i) { dma_fence_unwrap_for_each(tmp, &iter[i], fences[i]) - ++count; + if (!dma_fence_is_signaled(tmp)) + ++count; } if (count == 0) 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); |