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

Catching up with some display dependencies.

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

diff --cc Documentation/gpu/todo.rst
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_fb.c
index c55855729628d3ae47da7e0b9d6f5a6b242b871d,0da842bd2f2f13f7106cbb31465125295b49567e..22a4a1575d2236099ed8f6f69d7d86039f5328ad
--- 1/drivers/gpu/drm/i915/display/intel_fb.c
--- 2/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 7d77022235a5e8d133088112d3cbce47e070fe3a,403b8b63721a909d415ae851e05bd1871386faae..22514d5f2bb66e604adff1f4e730203509adc8ce
--- 1/drivers/gpu/drm/i915/display/intel_fb.h
--- 2/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,

diff --cc drivers/gpu/drm/i915/display/intel_plane_initial.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_wait.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gpu_error.c
Simple merge

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_fb_pin.c
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_plane_initial.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device_types.h
Simple merge

diff --cc include/drm/drm_buddy.h
Simple merge

diff --cc include/drm/drm_device.h
Simple merge