Skip to content

Commit a0bff0a

Browse files
apply dmacoherent patch for arm64
1 parent aa8e7a1 commit a0bff0a

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

arch/arm64/configs/bcm2711_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,11 @@ CONFIG_AUXDISPLAY=y
10651065
CONFIG_HD44780=m
10661066
CONFIG_DRM=m
10671067
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
1068+
CONFIG_DRM_AMDGPU=m
1069+
CONFIG_DRM_AMDGPU_SI=y
1070+
CONFIG_DRM_AMDGPU_CIK=y
1071+
CONFIG_DRM_XE=m
1072+
CONFIG_DRM_XE_FORCE_PROBE="*"
10681073
CONFIG_DRM_UDL=m
10691074
CONFIG_DRM_PANEL_LVDS=m
10701075
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m

arch/arm64/configs/bcm2712_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,11 @@ CONFIG_AUXDISPLAY=y
10671067
CONFIG_HD44780=m
10681068
CONFIG_DRM=m
10691069
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
1070+
CONFIG_DRM_AMDGPU=m
1071+
CONFIG_DRM_AMDGPU_SI=y
1072+
CONFIG_DRM_AMDGPU_CIK=y
1073+
CONFIG_DRM_XE=m
1074+
CONFIG_DRM_XE_FORCE_PROBE="*"
10701075
CONFIG_DRM_UDL=m
10711076
CONFIG_DRM_PANEL_LVDS=m
10721077
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m

drivers/gpu/drm/ttm/ttm_bo_util.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
359359
if (ret)
360360
return ret;
361361

362-
if (num_pages == 1 && ttm->caching == ttm_cached &&
362+
if (!IS_ENABLED(CONFIG_ARM64) &&
363+
num_pages == 1 && ttm->caching == ttm_cached &&
363364
!(man->use_tt && (ttm->page_flags & TTM_TT_FLAG_DECRYPTED))) {
364365
/*
365366
* We're mapping a single page, and the desired

drivers/gpu/drm/ttm/ttm_module.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp)
6363
{
6464
/* Cached mappings need no adjustment */
6565
if (caching == ttm_cached)
66+
#ifdef CONFIG_ARM64
67+
return pgprot_dmacoherent(tmp);
68+
#else
6669
return tmp;
70+
#endif
6771

6872
#if defined(__i386__) || defined(__x86_64__)
6973
if (caching == ttm_write_combined)

0 commit comments

Comments
 (0)