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

drm/xe: remove a number of superfluous compat macros 



Some compat macros have inadvertently been sprinkled in xe core
headers. Remove the final users and the macros.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/418185993c5825a54ac3f87a85463c799c91e47d.1726589119.git.jani.nikula@intel.com
parent 2ae68b01

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		goto err;

	}



	drm_gem_object_put(intel_bo_to_drm_bo(obj));

	drm_gem_object_put(&obj->ttm.base);



	return to_intel_framebuffer(fb);
@@ -102,7 +102,7 @@ int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb_info *info 
	XE_WARN_ON(iosys_map_is_null(&obj->vmap));



	info->screen_base = obj->vmap.vaddr_iomem;

	info->screen_size = intel_bo_to_drm_bo(obj)->size;

	info->screen_size = obj->ttm.base.size;



	return 0;

}

drivers/gpu/drm/xe/xe_bo.h

+0 −2
Original line number Diff line number Diff line
@@ -316,8 +316,6 @@ static inline unsigned int xe_sg_segment_size(struct device *dev) 
	return round_down(max / 2, PAGE_SIZE);

}



#define i915_gem_object_flush_if_display(obj)		((void)(obj))



#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)

/**

 * xe_bo_is_mem_type - Whether the bo currently resides in the given

drivers/gpu/drm/xe/xe_bo_types.h

+0 −3
Original line number Diff line number Diff line
@@ -78,7 +78,4 @@ struct xe_bo { 
		struct list_head vram_userfault_link;

};



#define intel_bo_to_drm_bo(bo) (&(bo)->ttm.base)

#define intel_bo_to_i915(bo) to_i915(intel_bo_to_drm_bo(bo)->dev)



#endif