| Message ID | 20200930020738.786609-1-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vmwgfx: return value from inserting in thp mode. | expand |
> On Sep 29, 2020, at 22:07, Dave Airlie <airlied@gmail.com> wrote: > > From: Dave Airlie <airlied@redhat.com> > > This seems to fix the failure I'm seeing with 5.9-rc7 under > vmplayer. > > Signed-off-by: Dave Airlie <airlied@redhat.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > index b7c816ba7166..c8b9335bccd8 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > @@ -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
On Wed, 30 Sep 2020 at 12:17, Zack Rusin <zackr@vmware.com> wrote: > > > > On Sep 29, 2020, at 22:07, Dave Airlie <airlied@gmail.com> wrote: > > > > From: Dave Airlie <airlied@redhat.com> > > > > This seems to fix the failure I'm seeing with 5.9-rc7 under > > vmplayer. > > > > Signed-off-by: Dave Airlie <airlied@redhat.com> > > --- > > drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > index b7c816ba7166..c8b9335bccd8 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > @@ -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? > Please ASAP. I'm trying to test TTM changes, so I'd like to know I've had a stable base here. Dave.
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c index b7c816ba7166..c8b9335bccd8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c @@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man, mem->start = node->start; } - return 0; + return ret; }