search for: nouveau_user_framebuffer_cr

...ispnv50/disp.c index e4c8ce6dd40a..eed579a6c858 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2648,7 +2648,6 @@ nv50_disp_atomic_state_alloc(struct drm_device *dev) static const struct drm_mode_config_funcs nv50_disp_func = { .fb_create = nouveau_user_framebuffer_create, - .output_poll_changed = drm_fb_helper_output_poll_changed, .atomic_check = nv50_disp_atomic_check, .atomic_commit = nv50_disp_atomic_commit, .atomic_state_alloc = nv50_disp_atomic_state_alloc, diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_displ...

...2f6..a0772389ed90 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -2049,7 +2049,7 @@ nv50_disp_atomic_state_alloc(struct drm_device *dev) > static const struct drm_mode_config_funcs > nv50_disp_func = { > .fb_create = nouveau_user_framebuffer_create, > - .output_poll_changed = drm_fb_helper_output_poll_changed, > + .output_poll_changed = nouveau_fbcon_output_poll_changed, > .atomic_check = nv50_disp_atomic_check, > .atomic_commit = nv50_disp_atomic_commit, > .atomic_state_alloc = nv50_disp_atomic_state_alloc, > diff...

...| 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 72fdba1a1c5d..e8e6bc7b6d51 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -286,6 +286,10 @@ nouveau_user_framebuffer_create(struct drm_device *dev, return ERR_PTR(-ENOENT); nvbo = nouveau_gem_object(gem); + /* Handle is an imported dma-buf, so cannot be migrated to VRAM */ + if (gem->import_attach) + return ERR_PTR(-EINVAL); + ret = nouveau_framebuffer_new(dev, mode_cmd, nvbo, &fb); if (ret == 0)...

...ut_poll_changed(struct drm_device *dev) > +{ > + pm_runtime_get_sync(dev->dev); > + drm_fb_helper_hotplug_event(dev->fb_helper); > + pm_runtime_put_autosuspend(dev->dev); > +} > + > static const struct drm_mode_config_funcs > nv50_disp_func = { > .fb_create = nouveau_user_framebuffer_create, > - .output_poll_changed = drm_fb_helper_output_poll_changed, > + .output_poll_changed = nouveau_output_poll_changed, It might make sense to provide a generic DRM helper for this. Same for patch 3 in this series. Thanks, Lukas

Unpinning wasn't always handled correctly. The crtc_disable and nouveau_fbcon_destroy calls needed to unpin but didn't, resulting in a pin leak. While debugging this I found some leaks in the error paths of nouveau_user_framebuffer_create, so I fixed those too. Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- drivers/gpu/drm/nouveau/nouveau_display.c | 15 ++++++++++----- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 7 +++++++ drivers/gpu/drm/nouveau/nv50_display.c | 13 +++++++++++++ 3...

...fb, mode_cmd); > + fb->obj[0] = gem; > > - ret = drm_framebuffer_init(dev, &fb->base, &nouveau_framebuffer_funcs); > + ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); > if (ret) > kfree(fb); > return ret; > @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, > struct drm_file *file_priv, > const struct drm_mode_fb_cmd2 *mode_cmd) > { > - struct nouveau_framebuffer *fb; > + struct drm_framebuffer *fb; > struct drm_gem_object *gem; > int ret; > > @@ -260,7 +260,7 @@ nouveau_use...

...amebuffer_init(dev, &fb->base, >>> &nouveau_framebuffer_funcs); >>> +??? ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >>> ????? if (ret) >>> ????????? kfree(fb); >>> ????? return ret; >>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >>> *dev, >>> ????????????????? struct drm_file *file_priv, >>> ????????????????? const struct drm_mode_fb_cmd2 *mode_cmd) >>> ? { >>> -??? struct nouveau_framebuffer *fb; >>> +??? struct drm_framebuffer *fb; >>&gt...

...; Here, have a completely untested patch to fix things... > > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -138,17 +143,26 @@ nouveau_user_framebuffer_create(struct drm_device *dev, > { > struct nouveau_framebuffer *nouveau_fb; > struct drm_gem_object *gem; > + struct nouveau_bo *nvbo; > int ret = -ENOMEM; > > gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); >...

...ispnv50/disp.c index 8b522a9b12f6..a0772389ed90 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2049,7 +2049,7 @@ nv50_disp_atomic_state_alloc(struct drm_device *dev) static const struct drm_mode_config_funcs nv50_disp_func = { .fb_create = nouveau_user_framebuffer_create, - .output_poll_changed = drm_fb_helper_output_poll_changed, + .output_poll_changed = nouveau_fbcon_output_poll_changed, .atomic_check = nv50_disp_atomic_check, .atomic_commit = nv50_disp_atomic_commit, .atomic_state_alloc = nv50_disp_atomic_state_alloc, diff --git a/drivers/gpu/drm/nouve...

...ispnv50/disp.c index 8b522a9b12f6..a0772389ed90 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2049,7 +2049,7 @@ nv50_disp_atomic_state_alloc(struct drm_device *dev) static const struct drm_mode_config_funcs nv50_disp_func = { .fb_create = nouveau_user_framebuffer_create, - .output_poll_changed = drm_fb_helper_output_poll_changed, + .output_poll_changed = nouveau_fbcon_output_poll_changed, .atomic_check = nv50_disp_atomic_check, .atomic_commit = nv50_disp_atomic_commit, .atomic_state_alloc = nv50_disp_atomic_state_alloc, diff --git a/drivers/gpu/drm/nouve...

...framebuffer_init(dev, &fb->base, >>> &nouveau_framebuffer_funcs); >>> +??? ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >>> ????? if (ret) >>> ????????? kfree(fb); >>> ????? return ret; >>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >>> *dev, >>> ????????????????? struct drm_file *file_priv, >>> ????????????????? const struct drm_mode_fb_cmd2 *mode_cmd) >>> ? { >>> -??? struct nouveau_framebuffer *fb; >>> +??? struct drm_framebuffer *fb; >>>...

...ix things... > >> > >> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > >> --- a/drivers/gpu/drm/nouveau/nouveau_display.c > >> +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > >> @@ -138,17 +143,26 @@ nouveau_user_framebuffer_create(struct drm_device *dev, > >> { > >> struct nouveau_framebuffer *nouveau_fb; > >> struct drm_gem_object *gem; > >> + struct nouveau_bo *nvbo; > >> int ret = -ENOMEM; > >> > >> gem = drm_gem_obje...

...;> &nouveau_framebuffer_funcs); > >>>> + ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); > >>>> if (ret) > >>>> kfree(fb); > >>>> return ret; > >>>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device > >>>> *dev, > >>>> struct drm_file *file_priv, > >>>> const struct drm_mode_fb_cmd2 *mode_cmd) > >>>> { > >>>> - struct nouveau_framebuffer *fb; > >&gt...

...>>>>>>> + ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >>>>>>> if (ret) >>>>>>> kfree(fb); >>>>>>> return ret; >>>>>>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >>>>>>> *dev, >>>>>>> struct drm_file *file_priv, >>>>>>> const struct drm_mode_fb_cmd2 *mode_cmd) >>>>>>> { >>>>>>> - struct...

...= gem; + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); + fb->obj[0] = gem; - ret = drm_framebuffer_init(dev, &fb->base, &nouveau_framebuffer_funcs); + ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); if (ret) kfree(fb); return ret; @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) { - struct nouveau_framebuffer *fb; + struct drm_framebuffer *fb; struct drm_gem_object *gem; int ret; @@ -260,7 +260,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, re...

Latest version of https://patchwork.freedesktop.org/series/46815/ , with one small change re: ilia Lyude Paul (5): drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement drm/nouveau: Remove duplicate poll_enable() in pmops_runtime_suspend() drm/nouveau: Fix deadlock with fb_helper with async RPM requests drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()

...>> -??? ret = drm_framebuffer_init(dev, &fb->base, >> &nouveau_framebuffer_funcs); >> +??? ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >> ????? if (ret) >> ????????? kfree(fb); >> ????? return ret; >> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >> *dev, >> ????????????????? struct drm_file *file_priv, >> ????????????????? const struct drm_mode_fb_cmd2 *mode_cmd) >> ? { >> -??? struct nouveau_framebuffer *fb; >> +??? struct drm_framebuffer *fb; >> ????? struct drm_gem_object...

...gt;> ? -??? ret = drm_framebuffer_init(dev, &fb->base, >> &nouveau_framebuffer_funcs); >> +??? ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >> ????? if (ret) >> ????????? kfree(fb); >> ????? return ret; >> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >> *dev, >> ????????????????? struct drm_file *file_priv, >> ????????????????? const struct drm_mode_fb_cmd2 *mode_cmd) >> ? { >> -??? struct nouveau_framebuffer *fb; >> +??? struct drm_framebuffer *fb; >> ????? struct drm_gem_object *...

...;fb->base, >>>> &nouveau_framebuffer_funcs); >>>> +??? ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); >>>> ?????? if (ret) >>>> ?????????? kfree(fb); >>>> ?????? return ret; >>>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device >>>> *dev, >>>> ?????????????????? struct drm_file *file_priv, >>>> ?????????????????? const struct drm_mode_fb_cmd2 *mode_cmd) >>>> ?? { >>>> -??? struct nouveau_framebuffer *fb; >>>> +??? struct drm_fram...

...->base, > >>> &nouveau_framebuffer_funcs); > >>> + ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs); > >>> if (ret) > >>> kfree(fb); > >>> return ret; > >>> @@ -250,7 +250,7 @@ nouveau_user_framebuffer_create(struct drm_device > >>> *dev, > >>> struct drm_file *file_priv, > >>> const struct drm_mode_fb_cmd2 *mode_cmd) > >>> { > >>> - struct nouveau_framebuffer *fb; > >>> + struct drm_f...