From: Rodrigo Vivi Date: Tue, 27 Aug 2024 21:06:28 +0000 (-0400) Subject: Merge drm/drm-next into drm-intel-next X-Git-Tag: v6.12-rc1~126^2~14^2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04cf420bbc32a599aa2481725f708435ea19bf3d;p=thirdparty%2Fkernel%2Flinux.git Merge drm/drm-next into drm-intel-next Need to take some Xe bo definition in here before we can add the BMG display 64k aligned size restrictions. Signed-off-by: Rodrigo Vivi --- 04cf420bbc32a599aa2481725f708435ea19bf3d diff --cc drivers/gpu/drm/xe/xe_pci.c index da090f0e592f8,3c4a3c91377a1..b42aa304c4e99 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@@ -828,11 -831,12 +831,11 @@@ static int xe_pci_probe(struct pci_dev xe->info.media_verx100 % 100, str_yes_no(xe->info.enable_display), xe->info.dma_mask_size, xe->info.tile_count, - xe->info.has_heci_gscfi); + xe->info.has_heci_gscfi, xe->info.has_heci_cscfi); - drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n", + drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, B:%s)\n", xe_step_name(xe->info.step.graphics), xe_step_name(xe->info.step.media), - xe_step_name(xe->info.step.display), xe_step_name(xe->info.step.basedie)); drm_dbg(&xe->drm, "SR-IOV support: %s (mode: %s)\n",