From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Wed, 10 Sep 2025 12:01:42 +0000 (-0400)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=702fdf3513b045f596f836d9a4b8672c76f11834;p=users%2Fhch%2Fmisc.git

Merge drm/drm-next into drm-intel-next

Catching up with some display dependencies.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

702fdf3513b045f596f836d9a4b8672c76f11834
diff --cc drivers/gpu/drm/i915/display/intel_fb.c
index c55855729628,0da842bd2f2f..22a4a1575d22
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@@ -2341,28 -2342,9 +2344,29 @@@ intel_user_framebuffer_create(struct dr
  	return fb;
  }
  
 +struct intel_framebuffer *intel_framebuffer_alloc(void)
 +{
 +	struct intel_framebuffer *intel_fb;
 +	struct intel_panic *panic;
 +
 +	intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
 +	if (!intel_fb)
 +		return NULL;
 +
 +	panic = intel_panic_alloc();
 +	if (!panic) {
 +		kfree(intel_fb);
 +		return NULL;
 +	}
 +
 +	intel_fb->panic = panic;
 +
 +	return intel_fb;
 +}
 +
  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;
diff --cc drivers/gpu/drm/i915/display/intel_fb.h
index 7d77022235a5,403b8b63721a..22514d5f2bb6
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@@ -102,12 -102,11 +102,14 @@@ void intel_add_fb_offsets(int *x, int *
  
  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 intel_framebuffer *intel_framebuffer_alloc(void);
 +
  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,