|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
From 8339af08627104557ecd69e0e23396f2caed2050 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
From: Karol Herbst <kherbst@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
Date: Thu, 16 Sep 2021 13:07:55 -0400
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
Subject: [PATCH 6/6] Revert "nouveau: Stash supported sector layout in screen"
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
This reverts commit ff534e1b5066f1c8e7969f99f40ec080eee1b907.
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
---
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
src/gallium/drivers/nouveau/nouveau_screen.c | 12 ------------
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
src/gallium/drivers/nouveau/nouveau_screen.h | 1 -
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
2 files changed, 13 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
index 192044c7fb4..5c5253097b1 100644
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
@@ -272,18 +272,6 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
} while ((start + screen->svm_cutout_size) < BITFIELD64_MASK(limit_bit));
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
}
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- switch (dev->chipset) {
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- case 0x0ea: /* TK1, GK20A */
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- case 0x12b: /* TX1, GM20B */
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- case 0x13b: /* TX2, GP10B */
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- screen->tegra_sector_layout = true;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- break;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- default:
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- /* Xavier's GPU and everything else */
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- screen->tegra_sector_layout = false;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- break;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
-
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
/*
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
* Set default VRAM domain if not overridden
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
index 9460152eff1..58bdaa2065f 100644
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
@@ -60,7 +60,6 @@ struct nouveau_screen {
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
int64_t cpu_gpu_time_delta;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
bool hint_buf_keep_sysmem_copy;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
- bool tegra_sector_layout;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
unsigned vram_domain;
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
--
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
2.31.1
|
|
![](https://seccdn.libravatar.org/avatar/8cab5fc45d9566e5b133cc0e4fe053af87c3acfb91fa86956de4462c37b28683?s=16&d=retro) |
d11d1f4 |
|