Commit bf05aeac authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2024-09-12' of... 

Merge tag 'drm-intel-next-fixes-2024-09-12' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Add missing I915_FORMAT_MOD_4_TILED_BMG_CCS modifier for BMG
- Printk formatting fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZuKtfPJZ7vp79lWN@jlahtine-mobl.ger.corp.intel.com
parents b615b9c3 02895076

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

+1 −1
Original line number Diff line number Diff line
@@ -2948,7 +2948,7 @@ init_vbt_missing_defaults(struct intel_display *display) 
		list_add_tail(&devdata->node, &display->vbt.display_devices);



		drm_dbg_kms(display->drm,

			    "Generating default VBT child device with type 0x04%x on port %c\n",

			    "Generating default VBT child device with type 0x%04x on port %c\n",

			    child->device_type, port_name(port));

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915, 
	if (gen12_plane_has_mc_ccs(i915, plane_id))

		caps |= INTEL_PLANE_CAP_CCS_MC;



	if (DISPLAY_VER(i915) >= 14 && IS_DGFX(i915))

		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;



	return caps;

}