Commit 09e10499 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-05-02' of... 

Merge tag 'drm-misc-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

imagination:
- fix page-count macro

nouveau:
- avoid page-table allocation failures
- fix firmware memory allocation

panel:
- ili9341: avoid OF for device properties; respect deferred probe; fix
usage of errno codes

ttm:
- fix status output

vmwgfx:
- fix legacy display unit
- fix read length in fence signalling

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240502192117.GA12158@linux.fritz.box
parents 5c75d681 da85f0aa

drivers/gpu/drm/imagination/pvr_fw_mips.h

+3 −2
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ 
#include "pvr_rogue_mips.h"



#include <asm/page.h>

#include <linux/math.h>

#include <linux/types.h>



/* Forward declaration from pvr_gem.h. */

struct pvr_gem_object;



#define PVR_MIPS_PT_PAGE_COUNT ((ROGUE_MIPSFW_MAX_NUM_PAGETABLE_PAGES * ROGUE_MIPSFW_PAGE_SIZE_4K) \

				>> PAGE_SHIFT)

#define PVR_MIPS_PT_PAGE_COUNT DIV_ROUND_UP(ROGUE_MIPSFW_MAX_NUM_PAGETABLE_PAGES * ROGUE_MIPSFW_PAGE_SIZE_4K, PAGE_SIZE)



/**

 * struct pvr_fw_mips_data - MIPS-specific data

 */

drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ struct nvkm_gsp_mem { 
};



struct nvkm_gsp_radix3 {

	struct nvkm_gsp_mem mem[3];

	struct nvkm_gsp_mem lvl0;

	struct nvkm_gsp_mem lvl1;

	struct sg_table lvl2;

};



int nvkm_gsp_sg(struct nvkm_device *, u64 size, struct sg_table *);

drivers/gpu/drm/nouveau/nvkm/core/firmware.c

+12 −7
Original line number Diff line number Diff line
@@ -205,7 +205,9 @@ nvkm_firmware_dtor(struct nvkm_firmware *fw) 
		break;

	case NVKM_FIRMWARE_IMG_DMA:

		nvkm_memory_unref(&memory);

		dma_free_coherent(fw->device->dev, sg_dma_len(&fw->mem.sgl), fw->img, fw->phys);

		dma_unmap_single(fw->device->dev, fw->phys, sg_dma_len(&fw->mem.sgl),

				 DMA_TO_DEVICE);

		kfree(fw->img);

		break;

	case NVKM_FIRMWARE_IMG_SGT:

		nvkm_memory_unref(&memory);
@@ -235,14 +237,17 @@ nvkm_firmware_ctor(const struct nvkm_firmware_func *func, const char *name, 
		fw->img = kmemdup(src, fw->len, GFP_KERNEL);

		break;

	case NVKM_FIRMWARE_IMG_DMA: {

		dma_addr_t addr;



		len = ALIGN(fw->len, PAGE_SIZE);



		fw->img = dma_alloc_coherent(fw->device->dev, len, &addr, GFP_KERNEL);

		if (fw->img) {

		fw->img = kmalloc(len, GFP_KERNEL);

		if (!fw->img)

			return -ENOMEM;



		memcpy(fw->img, src, fw->len);

			fw->phys = addr;

		fw->phys = dma_map_single(fw->device->dev, fw->img, len, DMA_TO_DEVICE);

		if (dma_mapping_error(fw->device->dev, fw->phys)) {

			kfree(fw->img);

			return -EFAULT;

		}



		sg_init_one(&fw->mem.sgl, fw->img, len);

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

+51 −26
Original line number Diff line number Diff line
@@ -1624,7 +1624,7 @@ r535_gsp_wpr_meta_init(struct nvkm_gsp *gsp) 
	meta->magic = GSP_FW_WPR_META_MAGIC;

	meta->revision = GSP_FW_WPR_META_REVISION;



	meta->sysmemAddrOfRadix3Elf = gsp->radix3.mem[0].addr;

	meta->sysmemAddrOfRadix3Elf = gsp->radix3.lvl0.addr;

	meta->sizeOfRadix3Elf = gsp->fb.wpr2.elf.size;



	meta->sysmemAddrOfBootloader = gsp->boot.fw.addr;
@@ -1919,8 +1919,9 @@ nvkm_gsp_sg(struct nvkm_device *device, u64 size, struct sg_table *sgt) 
static void

nvkm_gsp_radix3_dtor(struct nvkm_gsp *gsp, struct nvkm_gsp_radix3 *rx3)

{

	for (int i = ARRAY_SIZE(rx3->mem) - 1; i >= 0; i--)

		nvkm_gsp_mem_dtor(gsp, &rx3->mem[i]);

	nvkm_gsp_sg_free(gsp->subdev.device, &rx3->lvl2);

	nvkm_gsp_mem_dtor(gsp, &rx3->lvl1);

	nvkm_gsp_mem_dtor(gsp, &rx3->lvl0);

}



/**
@@ -1960,36 +1961,60 @@ static int 
nvkm_gsp_radix3_sg(struct nvkm_gsp *gsp, struct sg_table *sgt, u64 size,

		   struct nvkm_gsp_radix3 *rx3)

{

	u64 addr;



	for (int i = ARRAY_SIZE(rx3->mem) - 1; i >= 0; i--) {

		u64 *ptes;

	struct sg_dma_page_iter sg_dma_iter;

	struct scatterlist *sg;

	size_t bufsize;

		int ret, idx;

	u64 *pte;

	int ret, i, page_idx = 0;



		bufsize = ALIGN((size / GSP_PAGE_SIZE) * sizeof(u64), GSP_PAGE_SIZE);

		ret = nvkm_gsp_mem_ctor(gsp, bufsize, &rx3->mem[i]);

	ret = nvkm_gsp_mem_ctor(gsp, GSP_PAGE_SIZE, &rx3->lvl0);

	if (ret)

		return ret;



		ptes = rx3->mem[i].data;

		if (i == 2) {

			struct scatterlist *sgl;

	ret = nvkm_gsp_mem_ctor(gsp, GSP_PAGE_SIZE, &rx3->lvl1);

	if (ret)

		goto lvl1_fail;



	// Allocate level 2

	bufsize = ALIGN((size / GSP_PAGE_SIZE) * sizeof(u64), GSP_PAGE_SIZE);

	ret = nvkm_gsp_sg(gsp->subdev.device, bufsize, &rx3->lvl2);

	if (ret)

		goto lvl2_fail;



	// Write the bus address of level 1 to level 0

	pte = rx3->lvl0.data;

	*pte = rx3->lvl1.addr;



	// Write the bus address of each page in level 2 to level 1

	pte = rx3->lvl1.data;

	for_each_sgtable_dma_page(&rx3->lvl2, &sg_dma_iter, 0)

		*pte++ = sg_page_iter_dma_address(&sg_dma_iter);



			for_each_sgtable_dma_sg(sgt, sgl, idx) {

				for (int j = 0; j < sg_dma_len(sgl) / GSP_PAGE_SIZE; j++)

					*ptes++ = sg_dma_address(sgl) + (GSP_PAGE_SIZE * j);

	// Finally, write the bus address of each page in sgt to level 2

	for_each_sgtable_sg(&rx3->lvl2, sg, i) {

		void *sgl_end;



		pte = sg_virt(sg);

		sgl_end = (void *)pte + sg->length;



		for_each_sgtable_dma_page(sgt, &sg_dma_iter, page_idx) {

			*pte++ = sg_page_iter_dma_address(&sg_dma_iter);

			page_idx++;



			// Go to the next scatterlist for level 2 if we've reached the end

			if ((void *)pte >= sgl_end)

				break;

		}

		} else {

			for (int j = 0; j < size / GSP_PAGE_SIZE; j++)

				*ptes++ = addr + GSP_PAGE_SIZE * j;

	}



		size = rx3->mem[i].size;

		addr = rx3->mem[i].addr;

	if (ret) {

lvl2_fail:

		nvkm_gsp_mem_dtor(gsp, &rx3->lvl1);

lvl1_fail:

		nvkm_gsp_mem_dtor(gsp, &rx3->lvl0);

	}



	return 0;

	return ret;

}



int
@@ -2021,7 +2046,7 @@ r535_gsp_fini(struct nvkm_gsp *gsp, bool suspend) 
		sr = gsp->sr.meta.data;

		sr->magic = GSP_FW_SR_META_MAGIC;

		sr->revision = GSP_FW_SR_META_REVISION;

		sr->sysmemAddrOfSuspendResumeData = gsp->sr.radix3.mem[0].addr;

		sr->sysmemAddrOfSuspendResumeData = gsp->sr.radix3.lvl0.addr;

		sr->sizeOfSuspendResumeData = len;



		mbox0 = lower_32_bits(gsp->sr.meta.addr);

drivers/gpu/drm/panel/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ config DRM_PANEL_ILITEK_IL9322 


config DRM_PANEL_ILITEK_ILI9341

	tristate "Ilitek ILI9341 240x320 QVGA panels"

	depends on OF && SPI

	depends on SPI

	select DRM_KMS_HELPER

	select DRM_GEM_DMA_HELPER

	depends on BACKLIGHT_CLASS_DEVICE