Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 59ab4ee

Browse files
Cong Liukraxel
authored andcommitted
drm/qxl: fix qxl can't use in arm64
qxl use ioremap to map ram_header and rom, in the arm64 implementation, the device is mapped as DEVICE_nGnRE, it can not support unaligned access. and qxl is a virtual device, it can be treated more like RAM than actual MMIO registers. use ioremap_wc() replace it. Signed-off-by: Cong Liu <[email protected]> Acked-by: Christian König <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Gerd Hoffmann <[email protected]>
1 parent ec3cbb3 commit 59ab4ee

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/gpu/drm/qxl/qxl_kms.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ int qxl_device_init(struct qxl_device *qdev,
165165
(int)qdev->surfaceram_size / 1024,
166166
(sb == 4) ? "64bit" : "32bit");
167167

168-
qdev->rom = ioremap(qdev->rom_base, qdev->rom_size);
168+
qdev->rom = ioremap_wc(qdev->rom_base, qdev->rom_size);
169169
if (!qdev->rom) {
170170
pr_err("Unable to ioremap ROM\n");
171171
r = -ENOMEM;
@@ -183,7 +183,7 @@ int qxl_device_init(struct qxl_device *qdev,
183183
goto rom_unmap;
184184
}
185185

186-
qdev->ram_header = ioremap(qdev->vram_base +
186+
qdev->ram_header = ioremap_wc(qdev->vram_base +
187187
qdev->rom->ram_header_offset,
188188
sizeof(*qdev->ram_header));
189189
if (!qdev->ram_header) {

drivers/gpu/drm/qxl/qxl_ttm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ int qxl_ttm_io_mem_reserve(struct ttm_device *bdev,
8282
case TTM_PL_VRAM:
8383
mem->bus.is_iomem = true;
8484
mem->bus.offset = (mem->start << PAGE_SHIFT) + qdev->vram_base;
85-
mem->bus.caching = ttm_cached;
85+
mem->bus.caching = ttm_write_combined;
8686
break;
8787
case TTM_PL_PRIV:
8888
mem->bus.is_iomem = true;
8989
mem->bus.offset = (mem->start << PAGE_SHIFT) +
9090
qdev->surfaceram_base;
91-
mem->bus.caching = ttm_cached;
91+
mem->bus.caching = ttm_write_combined;
9292
break;
9393
default:
9494
return -EINVAL;

0 commit comments

Comments
 (0)