Commit e5405178 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: drop cast from DEFINE_RES_MEM() usage 



Since commit 52c4d11f ("resource: Convert DEFINE_RES_NAMED() to be
compound literal") it's no longer necessary to cast DEFINE_RES_MEM() to
struct resource.

This also fixes sparse warnings "cast from non-scalar" and "cast to
non-scalar".

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230116173422.1858527-2-jani.nikula@intel.com
parent 1eca0778

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+3 −7
Original line number Diff line number Diff line
@@ -110,9 +110,7 @@ static int adjust_stolen(struct drm_i915_private *i915, 
		else

			ggtt_start &= PGTBL_ADDRESS_LO_MASK;



		ggtt_res =

			(struct resource) DEFINE_RES_MEM(ggtt_start,

							 ggtt_total_entries(ggtt) * 4);

		ggtt_res = DEFINE_RES_MEM(ggtt_start, ggtt_total_entries(ggtt) * 4);



		if (ggtt_res.start >= stolen[0].start && ggtt_res.start < stolen[0].end)

			stolen[0].end = ggtt_res.start;
@@ -471,8 +469,7 @@ static int init_reserved_stolen(struct drm_i915_private *i915) 
		goto bail_out;

	}



	i915->dsm.reserved =

		(struct resource)DEFINE_RES_MEM(reserved_base, reserved_size);

	i915->dsm.reserved = DEFINE_RES_MEM(reserved_base, reserved_size);



	if (!resource_contains(&i915->dsm.stolen, &i915->dsm.reserved)) {

		drm_err(&i915->drm,
@@ -485,8 +482,7 @@ static int init_reserved_stolen(struct drm_i915_private *i915) 
	return 0;



bail_out:

	i915->dsm.reserved =

		(struct resource)DEFINE_RES_MEM(reserved_base, 0);

	i915->dsm.reserved = DEFINE_RES_MEM(reserved_base, 0);



	return ret;

}

drivers/gpu/drm/i915/gt/intel_ggtt.c

+2 −2
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static void gen6_gmch_remove(struct i915_address_space *vm) 


static struct resource pci_resource(struct pci_dev *pdev, int bar)

{

	return (struct resource)DEFINE_RES_MEM(pci_resource_start(pdev, bar),

	return DEFINE_RES_MEM(pci_resource_start(pdev, bar),

			      pci_resource_len(pdev, bar));

}

drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c

+1 −2
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ int intel_ggtt_gmch_probe(struct i915_ggtt *ggtt) 


	intel_gmch_gtt_get(&ggtt->vm.total, &gmadr_base, &ggtt->mappable_end);



	ggtt->gmadr =

		(struct resource)DEFINE_RES_MEM(gmadr_base, ggtt->mappable_end);

	ggtt->gmadr = DEFINE_RES_MEM(gmadr_base, ggtt->mappable_end);



	ggtt->vm.alloc_pt_dma = alloc_pt_dma;

	ggtt->vm.alloc_scratch_dma = alloc_pt_dma;

drivers/gpu/drm/i915/intel_memory_region.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ intel_memory_region_create(struct drm_i915_private *i915, 
		return ERR_PTR(-ENOMEM);



	mem->i915 = i915;

	mem->region = (struct resource)DEFINE_RES_MEM(start, size);

	mem->region = DEFINE_RES_MEM(start, size);

	mem->io_start = io_start;

	mem->io_size = io_size;

	mem->min_page_size = min_page_size;

drivers/gpu/drm/i915/selftests/mock_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void mock_init_ggtt(struct intel_gt *gt) 
	ggtt->vm.i915 = gt->i915;

	ggtt->vm.is_ggtt = true;



	ggtt->gmadr = (struct resource) DEFINE_RES_MEM(0, 2048 * PAGE_SIZE);

	ggtt->gmadr = DEFINE_RES_MEM(0, 2048 * PAGE_SIZE);

	ggtt->mappable_end = resource_size(&ggtt->gmadr);

	ggtt->vm.total = 4096 * PAGE_SIZE;