Skip to content

6.18: PCIe GPU testing (AMD and Intel Xe) #7113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: rpi-6.18.y
Choose a base branch
from
+22 −2
Open

6.18: PCIe GPU testing (AMD and Intel Xe) #7113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1610ef
drm/ttm: Use dmacoherent allocations on ARM64
yanghaku May 28, 2025
d841e91
defconfig: Add amdgpu and radeon drivers to 2711/2712 defconfig
6by9 Sep 30, 2025
6a7bff6
drm/i915: Only reset console if enabled
6by9 Oct 1, 2025
0db3079
drm/i915: Another legacy path to be nuked
6by9 Oct 1, 2025
2ef2bea
defconfigs: Add Intel XE graphics driver to 2711 and 2712 defconfigs.
6by9 Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions arch/arm64/configs/bcm2711_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,12 @@ CONFIG_AUXDISPLAY=y
CONFIG_HD44780=m
CONFIG_DRM=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_RADEON=m
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_SI=y
CONFIG_DRM_AMDGPU_CIK=y
CONFIG_DRM_XE=m
CONFIG_DRM_XE_FORCE_PROBE="*"
CONFIG_DRM_UDL=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/configs/bcm2712_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,12 @@ CONFIG_AUXDISPLAY=y
CONFIG_HD44780=m
CONFIG_DRM=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_RADEON=m
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_SI=y
CONFIG_DRM_AMDGPU_CIK=y
CONFIG_DRM_XE=m
CONFIG_DRM_XE_FORCE_PROBE="*"
CONFIG_DRM_UDL=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/display/intel_display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7645,6 +7645,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
* FIXME: Cut over to (async) commit helpers instead of hand-rolling
* everything.
*/
#if defined(CONFIG_VGA_CONSOLE)
if (state->base.legacy_cursor_update) {
struct intel_crtc_state *new_crtc_state;
struct intel_crtc *crtc;
Expand All @@ -7653,7 +7654,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
complete_all(&new_crtc_state->uapi.commit->flip_done);
}

#endif
ret = intel_atomic_prepare_commit(state);
if (ret) {
drm_dbg_atomic(display->drm,
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/display/intel_vga.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void intel_vga_disable(struct intel_display *display)

void intel_vga_reset_io_mem(struct intel_display *display)
{
#if defined(CONFIG_VGA_CONSOLE)
struct pci_dev *pdev = to_pci_dev(display->drm->dev);

/*
Expand All @@ -93,6 +94,7 @@ void intel_vga_reset_io_mem(struct intel_display *display)
vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
outb(inb(VGA_MIS_R), VGA_MIS_W);
vga_put(pdev, VGA_RSRC_LEGACY_IO);
#endif
}

int intel_vga_register(struct intel_display *display)
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/ttm/ttm_bo_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
if (ret)
return ret;

if (num_pages == 1 && ttm->caching == ttm_cached &&
if (!IS_ENABLED(CONFIG_ARM64) &&
num_pages == 1 && ttm->caching == ttm_cached &&
!(man->use_tt && (ttm->page_flags & TTM_TT_FLAG_DECRYPTED))) {
/*
* We're mapping a single page, and the desired
Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/ttm/ttm_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp)
{
/* Cached mappings need no adjustment */
if (caching == ttm_cached)
#ifdef CONFIG_ARM64
return pgprot_dmacoherent(tmp);
#else
return tmp;
#endif

#if defined(__i386__) || defined(__x86_64__)
if (caching == ttm_write_combined)
Expand Down
Loading