Skip to contentSkip to conversation

drm/vmwgfx: return value from inserting in thp mode.

PATCH In review Dave Airlie 2 participants 3 messages Sep 30, 2020

Subsystems (3)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/vmwgfx: return value from inserting in thp mode.

From: Dave Airlie <[email protected]>

This seems to fix the failure I'm seeing with 5.9-rc7 under vmplayer.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
index b7c816ba7166..c8b9335bccd8 100644
@@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 		mem->start = node->start;
 	}
 
-	return 0;
+	return ret;
 }
 
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 18 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This seems to fix the failure I'm seeing with 5.9-rc7 under vmplayer.

---
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +0 -0
index b7c816ba7166..c8b9335bccd8 100644

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c static int vmw_thp_get_node(struct ttm_mem_type_manager *man, · line 99

Quoted 6 lines
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
@@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 		mem->start = node->start;
 	}
 
-	return 0;
+	return ret;
 }

That’s part of it. Roland, has a patch from me in his tree that fixes it. Roland, can you please submit it to Dave for merge?

z
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#2 lore raw
Quoted 22 lines · Zack Rusin
Quoted 22 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This seems to fix the failure I'm seeing with 5.9-rc7 under vmplayer.

---
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +0 -0
index b7c816ba7166..c8b9335bccd8 100644
@@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
              mem->start = node->start;
      }
 
Quoted 6 lines

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c static int vmw_thp_get_node(struct ttm_mem_type_manager *man, · line 99

Quoted 3 lines
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
-     return 0;
+     return ret;
 }

That’s part of it. Roland, has a patch from me in his tree that fixes it. Roland, can you please submit it to Dave for merge?

Please ASAP. I'm trying to test TTM changes, so I'd like to know I've had a stable base here.

Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel