Commit 800df9e5 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct() 



Plumb the format info from .fb_create() all the way to
drm_helper_mode_fill_fb_struct() to avoid the redundant
lookup.

For the fbdev case a manual drm_get_format_info() lookup
is needed.

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250701090722.13645-14-ville.syrjala@linux.intel.com
parent 4a792c59

drivers/gpu/drm/i915/display/intel_fb.c

+5 −3
Original line number Diff line number Diff line
@@ -2207,6 +2207,7 @@ static const struct drm_framebuffer_funcs intel_fb_funcs = { 


int intel_framebuffer_init(struct intel_framebuffer *intel_fb,

			   struct drm_gem_object *obj,

			   const struct drm_format_info *info,

			   struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct intel_display *display = to_intel_display(obj->dev);
@@ -2254,7 +2255,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
		goto err_frontbuffer_put;

	}



	drm_helper_mode_fill_fb_struct(display->drm, fb, NULL, mode_cmd);

	drm_helper_mode_fill_fb_struct(display->drm, fb, info, mode_cmd);



	for (i = 0; i < fb->format->num_planes; i++) {

		unsigned int stride_alignment;
@@ -2335,7 +2336,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 
	if (IS_ERR(obj))

		return ERR_CAST(obj);



	fb = intel_framebuffer_create(obj, &mode_cmd);

	fb = intel_framebuffer_create(obj, info, &mode_cmd);

	drm_gem_object_put(obj);



	return fb;
@@ -2343,6 +2344,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 


struct drm_framebuffer *

intel_framebuffer_create(struct drm_gem_object *obj,

			 const struct drm_format_info *info,

			 struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct intel_framebuffer *intel_fb;
@@ -2352,7 +2354,7 @@ intel_framebuffer_create(struct drm_gem_object *obj, 
	if (!intel_fb)

		return ERR_PTR(-ENOMEM);



	ret = intel_framebuffer_init(intel_fb, obj, mode_cmd);

	ret = intel_framebuffer_init(intel_fb, obj, info, mode_cmd);

	if (ret)

		goto err;

drivers/gpu/drm/i915/display/intel_fb.h

+2 −0
Original line number Diff line number Diff line
@@ -102,9 +102,11 @@ void intel_add_fb_offsets(int *x, int *y, 


int intel_framebuffer_init(struct intel_framebuffer *ifb,

			   struct drm_gem_object *obj,

			   const struct drm_format_info *info,

			   struct drm_mode_fb_cmd2 *mode_cmd);

struct drm_framebuffer *

intel_framebuffer_create(struct drm_gem_object *obj,

			 const struct drm_format_info *info,

			 struct drm_mode_fb_cmd2 *mode_cmd);

struct drm_framebuffer *

intel_user_framebuffer_create(struct drm_device *dev,

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

+5 −1
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		return ERR_PTR(-ENOMEM);

	}



	fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj), &mode_cmd);

	fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj),

				      drm_get_format_info(display->drm,

							  mode_cmd.pixel_format,

							  mode_cmd.modifier[0]),

				      &mode_cmd);

	i915_gem_object_put(obj);



	return to_intel_framebuffer(fb);

drivers/gpu/drm/i915/display/intel_plane_initial.c

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,8 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc, 
	mode_cmd.flags = DRM_MODE_FB_MODIFIERS;



	if (intel_framebuffer_init(to_intel_framebuffer(fb),

				   intel_bo_to_drm_bo(vma->obj), &mode_cmd)) {

				   intel_bo_to_drm_bo(vma->obj),

				   fb->format, &mode_cmd)) {

		drm_dbg_kms(display->drm, "intel fb init failed\n");

		goto err_vma;

	}

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

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,11 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		goto err;

	}



	fb = intel_framebuffer_create(&obj->ttm.base, &mode_cmd);

	fb = intel_framebuffer_create(&obj->ttm.base,

				      drm_get_format_info(dev,

							  mode_cmd.pixel_format,

							  mode_cmd.modifier[0]),

				      &mode_cmd);

	if (IS_ERR(fb)) {

		xe_bo_unpin_map_no_vm(obj);

		goto err;