Commit 441f0ec0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2022-11-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 6.2:

UAPI Changes:

Cross-subsystem Changes:
- dma-buf: locking improvements
- firmware: New API in the RaspberryPi firmware driver used by vc4

Core Changes:
- client: Null pointer dereference fix in drm_client_buffer_delete()
- mm/buddy: Add back random seed log
- ttm: Convert ttm_resource to use size_t for its size, fix for an
  undefined behaviour

Driver Changes:
- bridge:
  - adv7511: use dev_err_probe
  - it6505: Fix return value check of pm_runtime_get_sync
- panel:
  - sitronix: Fixes and clean-ups
- lcdif: Increase DMA burst size
- rockchip: runtime_pm improvements
- vc4: Fix for a regression preventing the use of 4k @ 60Hz, and
  further HDMI rate constraints check.
- vmwgfx: Cursor improvements

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221103083437.ksrh3hcdvxaof62l@houat
parents f80c71f7 ce28ab13

drivers/clk/bcm/clk-raspberrypi.c

+0 −19
Original line number Diff line number Diff line
@@ -18,25 +18,6 @@ 


#include <soc/bcm2835/raspberrypi-firmware.h>



enum rpi_firmware_clk_id {

	RPI_FIRMWARE_EMMC_CLK_ID = 1,

	RPI_FIRMWARE_UART_CLK_ID,

	RPI_FIRMWARE_ARM_CLK_ID,

	RPI_FIRMWARE_CORE_CLK_ID,

	RPI_FIRMWARE_V3D_CLK_ID,

	RPI_FIRMWARE_H264_CLK_ID,

	RPI_FIRMWARE_ISP_CLK_ID,

	RPI_FIRMWARE_SDRAM_CLK_ID,

	RPI_FIRMWARE_PIXEL_CLK_ID,

	RPI_FIRMWARE_PWM_CLK_ID,

	RPI_FIRMWARE_HEVC_CLK_ID,

	RPI_FIRMWARE_EMMC2_CLK_ID,

	RPI_FIRMWARE_M2MC_CLK_ID,

	RPI_FIRMWARE_PIXEL_BVB_CLK_ID,

	RPI_FIRMWARE_VEC_CLK_ID,

	RPI_FIRMWARE_NUM_CLK_ID,

};



static char *rpi_firmware_clk_names[] = {

	[RPI_FIRMWARE_EMMC_CLK_ID]	= "emmc",

	[RPI_FIRMWARE_UART_CLK_ID]	= "uart",

drivers/dma-buf/dma-buf.c

+2 −2
Original line number Diff line number Diff line
@@ -995,10 +995,10 @@ static void __unmap_dma_buf(struct dma_buf_attachment *attach, 
 */

void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach)

{

	if (WARN_ON(!dmabuf || !attach))

	if (WARN_ON(!dmabuf || !attach || dmabuf != attach->dmabuf))

		return;



	dma_resv_lock(attach->dmabuf->resv, NULL);

	dma_resv_lock(dmabuf->resv, NULL);



	if (attach->sgt) {

drivers/firmware/raspberrypi.c

+32 −6
Original line number Diff line number Diff line
@@ -228,6 +228,26 @@ static void rpi_register_clk_driver(struct device *dev) 
						-1, NULL, 0);

}



unsigned int rpi_firmware_clk_get_max_rate(struct rpi_firmware *fw, unsigned int id)

{

	struct rpi_firmware_clk_rate_request msg =

		RPI_FIRMWARE_CLK_RATE_REQUEST(id);

	int ret;



	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_MAX_CLOCK_RATE,

				    &msg, sizeof(msg));

	if (ret)

		/*

		 * If our firmware doesn't support that operation, or fails, we

		 * assume the maximum clock rate is absolute maximum we can

		 * store over our type.

		 */

		 return UINT_MAX;



	return le32_to_cpu(msg.rate);

}

EXPORT_SYMBOL_GPL(rpi_firmware_clk_get_max_rate);



static void rpi_firmware_delete(struct kref *kref)

{

	struct rpi_firmware *fw = container_of(kref, struct rpi_firmware,
@@ -311,6 +331,18 @@ static int rpi_firmware_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id rpi_firmware_of_match[] = {

	{ .compatible = "raspberrypi,bcm2835-firmware", },

	{},

};

MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);



struct device_node *rpi_firmware_find_node(void)

{

	return of_find_matching_node(NULL, rpi_firmware_of_match);

}

EXPORT_SYMBOL_GPL(rpi_firmware_find_node);



/**

 * rpi_firmware_get - Get pointer to rpi_firmware structure.

 * @firmware_node:    Pointer to the firmware Device Tree node.
@@ -366,12 +398,6 @@ struct rpi_firmware *devm_rpi_firmware_get(struct device *dev, 
}

EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);



static const struct of_device_id rpi_firmware_of_match[] = {

	{ .compatible = "raspberrypi,bcm2835-firmware", },

	{},

};

MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);



static struct platform_driver rpi_firmware_driver = {

	.driver = {

		.name = "raspberrypi-firmware",

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, 
		node->base.start = node->mm_nodes[0].start;

	} else {

		node->mm_nodes[0].start = 0;

		node->mm_nodes[0].size = node->base.num_pages;

		node->mm_nodes[0].size = PFN_UP(node->base.size);

		node->base.start = AMDGPU_BO_INVALID_OFFSET;

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+2 −1
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev, 
		/* GWS and OA don't need any alignment. */

		page_align = bp->byte_align;

		size <<= PAGE_SHIFT;



	} else if (bp->domain & AMDGPU_GEM_DOMAIN_GDS) {

		/* Both size and alignment must be a multiple of 4. */

		page_align = ALIGN(bp->byte_align, 4);
@@ -776,7 +777,7 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr) 
		return 0;

	}



	r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.resource->num_pages, &bo->kmap);

	r = ttm_bo_kmap(&bo->tbo, 0, PFN_UP(bo->tbo.base.size), &bo->kmap);

	if (r)

		return r;