| Message ID | 20240816125408.310253-70-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Provide client setup helper and convert drivers | expand |
On 8/16/24 2:23 PM, Thomas Zimmermann wrote: > Call drm_client_setup() to run the kernel's default client setup > for DRM. Set fbdev_probe in struct drm_driver, so that the client > setup can start the common fbdev client. > > The nouveau driver specifies a preferred color mode depending on > the available video memory, with a default of 32. Adapt this for > the new client interface. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Danilo Krummrich <dakr@kernel.org> > Cc: Karol Herbst <kherbst@redhat.com> > Cc: Lyude Paul <lyude@redhat.com> > Cc: Danilo Krummrich <dakr@redhat.com> > --- > drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 4a9a9b9c3935..445ebedf70d6 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -31,6 +31,7 @@ > #include <linux/dynamic_debug.h> > > #include <drm/drm_aperture.h> > +#include <drm/drm_client_setup.h> > #include <drm/drm_drv.h> > #include <drm/drm_fbdev_ttm.h> > #include <drm/drm_gem_ttm_helper.h> > @@ -873,9 +874,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > goto fail_pci; > > if (drm->client.device.info.ram_size <= 32 * 1024 * 1024) > - drm_fbdev_ttm_setup(drm->dev, 8); > + drm_client_setup(drm->dev, drm_format_info(DRM_FORMAT_C8)); > else > - drm_fbdev_ttm_setup(drm->dev, 32); > + drm_client_setup(drm->dev, NULL); > > quirk_broken_nv_runpm(pdev); > return 0; > @@ -1317,6 +1318,8 @@ driver_stub = { > .dumb_create = nouveau_display_dumb_create, > .dumb_map_offset = drm_gem_ttm_dumb_map_offset, > > + DRM_FBDEV_TTM_DRIVER_OPS, > + > .name = DRIVER_NAME, > .desc = DRIVER_DESC, > #ifdef GIT_REVISION
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 4a9a9b9c3935..445ebedf70d6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -31,6 +31,7 @@ #include <linux/dynamic_debug.h> #include <drm/drm_aperture.h> +#include <drm/drm_client_setup.h> #include <drm/drm_drv.h> #include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem_ttm_helper.h> @@ -873,9 +874,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev, goto fail_pci; if (drm->client.device.info.ram_size <= 32 * 1024 * 1024) - drm_fbdev_ttm_setup(drm->dev, 8); + drm_client_setup(drm->dev, drm_format_info(DRM_FORMAT_C8)); else - drm_fbdev_ttm_setup(drm->dev, 32); + drm_client_setup(drm->dev, NULL); quirk_broken_nv_runpm(pdev); return 0; @@ -1317,6 +1318,8 @@ driver_stub = { .dumb_create = nouveau_display_dumb_create, .dumb_map_offset = drm_gem_ttm_dumb_map_offset, + DRM_FBDEV_TTM_DRIVER_OPS, + .name = DRIVER_NAME, .desc = DRIVER_DESC, #ifdef GIT_REVISION
Call drm_client_setup() to run the kernel's default client setup for DRM. Set fbdev_probe in struct drm_driver, so that the client setup can start the common fbdev client. The nouveau driver specifies a preferred color mode depending on the available video memory, with a default of 32. Adapt this for the new client interface. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Karol Herbst <kherbst@redhat.com> Cc: Lyude Paul <lyude@redhat.com> Cc: Danilo Krummrich <dakr@redhat.com> --- drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)