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 | |
| parent | Merge tag 'amd-drm-next-5.20-2022-07-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (diff) | |
| parent | drm/mgag200: Don't read-back PCI option register before writing (diff) | |
| download | linux-dev-891ce1c9623f36194587d02774ac3d8c30c3ca72.tar.xz linux-dev-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
| -rw-r--r-- | drivers/dma-buf/dma-fence-unwrap.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 6 | ||||
| -rw-r--r-- | include/linux/dma-fence-unwrap.h | 6 |
3 files changed, 3 insertions, 12 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); diff --git a/include/linux/dma-fence-unwrap.h b/include/linux/dma-fence-unwrap.h index 390de1ee9d35..66b1e56fbb81 100644 --- a/include/linux/dma-fence-unwrap.h +++ b/include/linux/dma-fence-unwrap.h @@ -43,14 +43,10 @@ struct dma_fence *dma_fence_unwrap_next(struct dma_fence_unwrap *cursor); * Unwrap dma_fence_chain and dma_fence_array containers and deep dive into all * potential fences in them. If @head is just a normal fence only that one is * returned. - * - * Note that signalled fences are opportunistically filtered out, which - * means the iteration is potentially over no fence at all. */ #define dma_fence_unwrap_for_each(fence, cursor, head) \ for (fence = dma_fence_unwrap_first(head, cursor); fence; \ - fence = dma_fence_unwrap_next(cursor)) \ - if (!dma_fence_is_signaled(fence)) + fence = dma_fence_unwrap_next(cursor)) struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, struct dma_fence **fences, |