diff options
Diffstat (limited to 'patches/collateral-evolutions/drm/03-swiotlb.patch')
| -rw-r--r-- | patches/collateral-evolutions/drm/03-swiotlb.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/drm/03-swiotlb.patch b/patches/collateral-evolutions/drm/03-swiotlb.patch index 697c0634..e6dc53fe 100644 --- a/patches/collateral-evolutions/drm/03-swiotlb.patch +++ b/patches/collateral-evolutions/drm/03-swiotlb.patch @@ -5,7 +5,7 @@ to backport it to compat.git. So revert the changes. --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c -@@ -1376,11 +1376,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t +@@ -1373,11 +1373,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t } #endif @@ -19,7 +19,7 @@ to backport it to compat.git. So revert the changes. r = ttm_pool_populate(ttm); if (r) { -@@ -1426,12 +1428,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt +@@ -1423,12 +1425,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt } #endif @@ -36,7 +36,7 @@ to backport it to compat.git. So revert the changes. if (ttm_dma->dma_address[i]) { --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -601,11 +601,13 @@ static int radeon_ttm_tt_populate(struct +@@ -602,11 +602,13 @@ static int radeon_ttm_tt_populate(struct } #endif @@ -50,7 +50,7 @@ to backport it to compat.git. So revert the changes. r = ttm_pool_populate(ttm); if (r) { -@@ -647,12 +649,14 @@ static void radeon_ttm_tt_unpopulate(str +@@ -648,12 +650,14 @@ static void radeon_ttm_tt_unpopulate(str } #endif @@ -65,7 +65,7 @@ to backport it to compat.git. So revert the changes. for (i = 0; i < ttm->num_pages; i++) { if (gtt->ttm.dma_address[i]) { -@@ -875,6 +879,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -876,6 +880,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs; radeon_mem_types_list[i].driver_features = 0; radeon_mem_types_list[i++].data = NULL; @@ -73,7 +73,7 @@ to backport it to compat.git. So revert the changes. #ifdef CONFIG_SWIOTLB if (swiotlb_nr_tbl()) { sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool"); -@@ -884,6 +889,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -885,6 +890,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i++].data = NULL; } #endif |