Commit 891ce1c9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2022-07-14' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YtAjgcWC1zkNOGWa@linux-uq9g
parents 60693e3a 7d09c760

drivers/dma-buf/dma-fence-unwrap.c

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 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])

			if (!dma_fence_is_signaled(tmp))

				++count;

	}

drivers/gpu/drm/mgag200/mgag200_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

include/linux/dma-fence-unwrap.h

+1 −5
Original line number Diff line number Diff line
@@ -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,