search for: nouveau_fbcon_cr

...splay { > void *priv; > diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > index 02b36b44409c..d78bc03ad3b8 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c > +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, > struct nouveau_drm *drm = nouveau_drm(dev); > struct nvif_device *device = &drm->client.device; > struct fb_info *info; > - struct nouveau_framebuffer *fb; > + struct drm_framebuffer *fb; > struct nouveau_channel *chan; >...

...better solution, or if my solution breaks in all other cases. diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 8e7dc1d..3943a00 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -317,6 +317,9 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width, info->fix.mmio_len = pci_resource_len(dev->pdev, 1); /* Set aperture base/size for vesafb takeover */ + + info->apertures = alloc_apertures(1); + #if defined(__i386__) || defined(__x86_64__) if (nouveau_fbcon_has_vesafb_or_efifb(dev...

.../drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> index 02b36b44409c..d78bc03ad3b8 100644 >>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >>> ????? struct nouveau_drm *drm = nouveau_drm(dev); >>> ????? struct nvif_device *device = &drm->client.device; >>> ????? struct fb_info *info; >>> -??? struct nouveau_framebuffer *fb; >>> +??? struct drm_fra...

...drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> index 02b36b44409c..d78bc03ad3b8 100644 >>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >>> ????? struct nouveau_drm *drm = nouveau_drm(dev); >>> ????? struct nvif_device *device = &drm->client.device; >>> ????? struct fb_info *info; >>> -??? struct nouveau_framebuffer *fb; >>> +??? struct drm_frameb...

...>>>> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>>> index 02b36b44409c..d78bc03ad3b8 100644 > >>>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, > >>>> struct nouveau_drm *drm = nouveau_drm(dev); > >>>> struct nvif_device *device = &drm->client.device; > >>>> struct fb_info *info; > >>>> - struct nouveau_framebuffer *...

...gpu/drm/nouveau/nouveau_fbcon.c >>>>>>> index 02b36b44409c..d78bc03ad3b8 100644 >>>>>>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>>>>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>>>>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >>>>>>> struct nouveau_drm *drm = nouveau_drm(dev); >>>>>>> struct nvif_device *device = &drm->client.device; >>>>>>> struct fb_info *info; >>>>>>> -...

All fields in struct nouveau_framebuffer appear to be obsolete. The data structure can be replaced by struct drm_framebuffer entirely. Patch 1 removes several unused fields from struct nouveau_framebuffer. Patch 2 moves the field vma to struct nouveau_fbdev. The information in vma is only relevant for fbdev emulation, and as such he field is only used there. Patch 3 removes nvbo from struct

...er **pfb); struct nouveau_display { void *priv; diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 02b36b44409c..d78bc03ad3b8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, struct nouveau_drm *drm = nouveau_drm(dev); struct nvif_device *device = &drm->client.device; struct fb_info *info; - struct nouveau_framebuffer *fb; + struct drm_framebuffer *fb; struct nouveau_channel *chan; struct nouveau_bo *nvbo; struct drm_...

...t;> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> index 02b36b44409c..d78bc03ad3b8 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >> ????? struct nouveau_drm *drm = nouveau_drm(dev); >> ????? struct nvif_device *device = &drm->client.device; >> ????? struct fb_info *info; >> -??? struct nouveau_framebuffer *fb; >> +??? struct drm_framebuffer *fb; >>...

...gt;> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> index 02b36b44409c..d78bc03ad3b8 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >> ????? struct nouveau_drm *drm = nouveau_drm(dev); >> ????? struct nvif_device *device = &drm->client.device; >> ????? struct fb_info *info; >> -??? struct nouveau_framebuffer *fb; >> +??? struct drm_framebuffer *fb; >>...

...veau/nouveau_fbcon.c >>>> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>> index 02b36b44409c..d78bc03ad3b8 100644 >>>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >>>> ?????? struct nouveau_drm *drm = nouveau_drm(dev); >>>> ?????? struct nvif_device *device = &drm->client.device; >>>> ?????? struct fb_info *info; >>>> -??? struct nouveau_framebuffer *fb; >>>>...

...nouveau_fbcon.c > >>> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>> index 02b36b44409c..d78bc03ad3b8 100644 > >>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, > >>> struct nouveau_drm *drm = nouveau_drm(dev); > >>> struct nvif_device *device = &drm->client.device; > >>> struct fb_info *info; > >>> - struct nouveau_framebuffer *fb; > >>&g...

...;> b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>>>> index 02b36b44409c..d78bc03ad3b8 100644 >>>>>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>>>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c >>>>>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, >>>>>> struct nouveau_drm *drm = nouveau_drm(dev); >>>>>> struct nvif_device *device = &drm->client.device; >>>>>> struct fb_info *info; >>>>>> - struct nouveau_f...

...eau_fbcon.c > >>>>>>> index 02b36b44409c..d78bc03ad3b8 100644 > >>>>>>> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>>>>>> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c > >>>>>>> @@ -312,7 +312,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, > >>>>>>> struct nouveau_drm *drm = nouveau_drm(dev); > >>>>>>> struct nvif_device *device = &drm->client.device; > >>>>>>> struct fb_info *info; > >>&gt...

...ankhorst <maarten.lankhorst at ubuntu.com> --- diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 3ed12a8cfc91..a4a586807903 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -370,6 +370,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, ret = -ENOMEM; goto out_unlock; } + info->skip_vt_switch = 1; ret = fb_alloc_cmap(&info->cmap, 256, 0); if (ret) {

When the fbcon object is initialized, but nouveau_fbcon_create is not called, we run into a NULL pointer access within nouveau_fbcon_create when unloading nouveau. The call to drm_fb_helper_funcs.fb_probe is deferred until there is a display for real since 4.14, that's why fbcon->helper.fb is still not set. Signed-off-by: Karol Herbst <kherbst...

...2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 67572408d9ae..3a3d454b65e3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -366,12 +366,9 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, goto out_unlock; } - info->par = fbcon; - /* setup helper */ fbcon->helper.fb = &fb->base; - strcpy(info->fix.id, "nouveaufb"); if (!chan) info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_DISABLED; else @@ -386,9 +383,7...

...2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 9d6dba07c727..73cc3217068a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -366,12 +366,9 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, goto out_unlock; } - info->par = fbcon; - /* setup helper */ fbcon->helper.fb = &fb->base; - strcpy(info->fix.id, "nouveaufb"); if (!chan) info->flags = FBINFO_HWACCEL_DISABLED; else @@ -386,9 +383,7 @@ nouveau_fbcon...

Not holding the mutex potentially causes corruption of the kernel channel when page flipping. Cc: stable at vger.kernel.org #3.13 Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 29c3efdfc7dd..76e3cf025c10 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c

...er **pfb); struct nouveau_display { void *priv; diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 6b2f46b0c115..02b36b44409c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -335,7 +335,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, goto out; } - ret = nouveau_framebuffer_new(dev, &mode_cmd, nvbo, &fb); + ret = nouveau_framebuffer_new(dev, &mode_cmd, &nvbo->bo.base, &fb); if (ret) goto out_unref; @@ -376,12 +376,12 @@ nouveau_fbcon_create(struct drm_fb_help...