Commit de04744d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2021-09-03' of... 

Merge tag 'drm-misc-next-fixes-2021-09-03' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

drm-misc-next-fixes for v5.15:
- Fix ttm_bo_move_memcpy() when ttm_resource is subclassed.
- Small fixes to panfrost, mgag200, vc4.
- Small ttm compilation fixes.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/41ff5e54-0837-2226-a182-97ffd11ef01e@linux.intel.com
parents 06b224d5 efcefc71

Documentation/gpu/drm-mm.rst

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ TTM initialization 
    This section is outdated.



Drivers wishing to support TTM must pass a filled :c:type:`ttm_bo_driver

<ttm_bo_driver>` structure to ttm_bo_device_init, together with an

<ttm_bo_driver>` structure to ttm_device_init, together with an

initialized global reference to the memory manager.  The ttm_bo_driver

structure contains several fields with function pointers for

initializing the TTM, allocating and freeing memory, waiting for command

drivers/gpu/drm/mgag200/mgag200_pll.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static int mgag200_pixpll_compute_g200se_00(struct mgag200_pll *pixpll, long clo 
	unsigned int computed;



	m = n = p = s = 0;

	delta = 0xffffffff;

	permitteddelta = clock * 5 / 1000;



	for (testp = 8; testp > 0; testp /= 2) {

drivers/gpu/drm/panfrost/panfrost_mmu.c

+11 −20
Original line number Diff line number Diff line
@@ -58,25 +58,16 @@ static int write_cmd(struct panfrost_device *pfdev, u32 as_nr, u32 cmd) 
}



static void lock_region(struct panfrost_device *pfdev, u32 as_nr,

			u64 iova, size_t size)

			u64 iova, u64 size)

{

	u8 region_width;

	u64 region = iova & PAGE_MASK;

	/*

	 * fls returns:

	 * 1 .. 32

	 *

	 * 10 + fls(num_pages)

	 * results in the range (11 .. 42)

	 */



	size = round_up(size, PAGE_SIZE);



	region_width = 10 + fls(size >> PAGE_SHIFT);

	if ((size >> PAGE_SHIFT) != (1ul << (region_width - 11))) {

		/* not pow2, so must go up to the next pow2 */

		region_width += 1;

	}

	/* The size is encoded as ceil(log2) minus(1), which may be calculated

	 * with fls. The size must be clamped to hardware bounds.

	 */

	size = max_t(u64, size, AS_LOCK_REGION_MIN_SIZE);

	region_width = fls64(size - 1) - 1;

	region |= region_width;



	/* Lock the region that needs to be updated */
@@ -87,7 +78,7 @@ static void lock_region(struct panfrost_device *pfdev, u32 as_nr, 




static int mmu_hw_do_operation_locked(struct panfrost_device *pfdev, int as_nr,

				      u64 iova, size_t size, u32 op)

				      u64 iova, u64 size, u32 op)

{

	if (as_nr < 0)

		return 0;
@@ -104,7 +95,7 @@ static int mmu_hw_do_operation_locked(struct panfrost_device *pfdev, int as_nr, 


static int mmu_hw_do_operation(struct panfrost_device *pfdev,

			       struct panfrost_mmu *mmu,

			       u64 iova, size_t size, u32 op)

			       u64 iova, u64 size, u32 op)

{

	int ret;
@@ -121,7 +112,7 @@ static void panfrost_mmu_enable(struct panfrost_device *pfdev, struct panfrost_m 
	u64 transtab = cfg->arm_mali_lpae_cfg.transtab;

	u64 memattr = cfg->arm_mali_lpae_cfg.memattr;



	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0UL, AS_COMMAND_FLUSH_MEM);

	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0ULL, AS_COMMAND_FLUSH_MEM);



	mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), transtab & 0xffffffffUL);

	mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), transtab >> 32);
@@ -137,7 +128,7 @@ static void panfrost_mmu_enable(struct panfrost_device *pfdev, struct panfrost_m 


static void panfrost_mmu_disable(struct panfrost_device *pfdev, u32 as_nr)

{

	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0UL, AS_COMMAND_FLUSH_MEM);

	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0ULL, AS_COMMAND_FLUSH_MEM);



	mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), 0);

	mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), 0);
@@ -251,7 +242,7 @@ static size_t get_pgsize(u64 addr, size_t size) 


static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,

				     struct panfrost_mmu *mmu,

				     u64 iova, size_t size)

				     u64 iova, u64 size)

{

	if (mmu->as < 0)

		return;

drivers/gpu/drm/panfrost/panfrost_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ 
#define AS_FAULTSTATUS_ACCESS_TYPE_READ		(0x2 << 8)

#define AS_FAULTSTATUS_ACCESS_TYPE_WRITE	(0x3 << 8)



#define AS_LOCK_REGION_MIN_SIZE                 (1ULL << 15)



#define gpu_write(dev, reg, data) writel(data, dev->iomem + reg)

#define gpu_read(dev, reg) readl(dev->iomem + reg)

drivers/gpu/drm/ttm/ttm_bo_util.c

+3 −4
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 
	struct ttm_resource *src_mem = bo->resource;

	struct ttm_resource_manager *src_man =

		ttm_manager_type(bdev, src_mem->mem_type);

	struct ttm_resource src_copy = *src_mem;

	union {

		struct ttm_kmap_iter_tt tt;

		struct ttm_kmap_iter_linear_io io;
@@ -173,11 +172,11 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 
	}



	ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter);

	src_copy = *src_mem;

	ttm_bo_move_sync_cleanup(bo, dst_mem);



	if (!src_iter->ops->maps_tt)

		ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, &src_copy);

		ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, src_mem);

	ttm_bo_move_sync_cleanup(bo, dst_mem);



out_src_iter:

	if (!dst_iter->ops->maps_tt)

		ttm_kmap_iter_linear_io_fini(&_dst_iter.io, bdev, dst_mem);