Skip to content

AMD and Intel GPU support fixes for Raspberry Pi OS #10

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 2 commits into
base: rpi-6.17.y
Choose a base branch
from
+10 −13
Open

AMD and Intel GPU support fixes for Raspberry Pi OS #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d907dc
Intel Xe and i915 Arc driver fixes to bypass VGA issue.
geerlingguy Oct 1, 2025
93f7c26
yanghaku DRM patch to fix cache coherency issues.
geerlingguy Oct 1, 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
2 changes: 2 additions & 0 deletions 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 @@ -7636,6 +7636,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 @@ -7644,6 +7645,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) {
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 @@ -91,7 +91,9 @@ void intel_vga_reset_io_mem(struct intel_display *display)
* and error messages.
*/
vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
#if defined(CONFIG_VGA_CONSOLE)
outb(inb(VGA_MIS_R), VGA_MIS_W);
#endif
vga_put(pdev, VGA_RSRC_LEGACY_IO);
}

Expand Down
14 changes: 1 addition & 13 deletions 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 @@ -348,8 +348,6 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
.no_wait_gpu = false
};
struct ttm_tt *ttm = bo->ttm;
struct ttm_resource_manager *man =
ttm_manager_type(bo->bdev, bo->resource->mem_type);
pgprot_t prot;
int ret;

Expand All @@ -359,17 +357,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
if (ret)
return ret;

if (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
* page protection is consistent with the bo.
*/

map->bo_kmap_type = ttm_bo_map_kmap;
map->page = ttm->pages[start_page];
map->virtual = kmap(map->page);
} else {
{
/*
* We need to use vmap to get the desired page protection
* or to make the buffer object look contiguous.
Expand Down
5 changes: 5 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,12 @@ 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);
#endif
return tmp;
}

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