search for: nvif_object_ctor

...d; diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index cc7c5b4a05fd..9512f1c2f871 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -369,15 +369,29 @@ nouveau_accel_gr_init(struct nouveau_drm *drm) ret = nvif_object_ctor(&drm->channel->user, "drmNvsw", NVDRM_NVSW, nouveau_abi16_swclass(drm), NULL, 0, &drm->channel->nvsw); + + if (ret == 0 && device->info.chipset >= 0x11) { + ret = nvif_object_ctor(&drm->channel->user, "drmBlit&quo...

...d; diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index cc7c5b4a05fd..59e040a93a41 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -369,15 +369,28 @@ nouveau_accel_gr_init(struct nouveau_drm *drm) ret = nvif_object_ctor(&drm->channel->user, "drmNvsw", NVDRM_NVSW, nouveau_abi16_swclass(drm), NULL, 0, &drm->channel->nvsw); + + if (ret == 0) { + u32 blit_class = device->info.chipset >= 0x11 ? 0x009f : 0x005f; + ret = nvif_object_ctor(&drm->channe...

...vkm_subdev_init+0x60/0xa0 [ 2.154125] nvkm_device_init+0x14c/0x2a0 [ 2.154133] nvkm_udevice_init+0x60/0x9c [ 2.154140] nvkm_object_init+0x48/0x1b0 [ 2.154144] nvkm_ioctl_new+0x168/0x254 [ 2.154149] nvkm_ioctl+0xd0/0x220 [ 2.154153] nvkm_client_ioctl+0x10/0x1c [ 2.154162] nvif_object_ctor+0xf4/0x22c [ 2.154168] nvif_device_ctor+0x28/0x70 [ 2.154174] nouveau_cli_init+0x150/0x590 [ 2.154180] nouveau_drm_device_init+0x60/0x2a0 [ 2.154187] nouveau_platform_device_create+0x90/0xd0 [ 2.154193] nouveau_platform_probe+0x3c/0x9c [ 2.154200] platform_probe+0x68/0xc0 [...

...u/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index cc7c5b4a05fd..9512f1c2f871 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -369,15 +369,29 @@ nouveau_accel_gr_init(struct nouveau_drm *drm) > ret = nvif_object_ctor(&drm->channel->user, "drmNvsw", > NVDRM_NVSW, nouveau_abi16_swclass(drm), > NULL, 0, &drm->channel->nvsw); > + > + if (ret == 0 && device->info.chipset &g...

...[<000000006c56b3a4>] nvkm_ioctl_new+0x184/0x210 [nouveau] [<0000000080abc890>] nvkm_ioctl+0xf0/0x190 [nouveau] [<00000000f35056a2>] nvkm_client_ioctl+0x12/0x20 [nouveau] [<000000000f001008>] nvif_object_ioctl+0x4f/0x60 [nouveau] [<0000000098d66807>] nvif_object_ctor+0xfb/0x160 [nouveau] [<00000000fe24934a>] nvif_device_ctor+0x24/0x70 [nouveau] [<00000000878b3286>] nouveau_cli_init+0x1a3/0x460 [nouveau] [<00000000a1578335>] nouveau_drm_device_init+0x77/0x740 [nouveau] [<00000000faef6b28>] nouveau_drm_probe+0x132/0x1f0 [no...

...2.154125] nvkm_device_init+0x14c/0x2a0 > [ 2.154133] nvkm_udevice_init+0x60/0x9c > [ 2.154140] nvkm_object_init+0x48/0x1b0 > [ 2.154144] nvkm_ioctl_new+0x168/0x254 > [ 2.154149] nvkm_ioctl+0xd0/0x220 > [ 2.154153] nvkm_client_ioctl+0x10/0x1c > [ 2.154162] nvif_object_ctor+0xf4/0x22c > [ 2.154168] nvif_device_ctor+0x28/0x70 > [ 2.154174] nouveau_cli_init+0x150/0x590 > [ 2.154180] nouveau_drm_device_init+0x60/0x2a0 > [ 2.154187] nouveau_platform_device_create+0x90/0xd0 > [ 2.154193] nouveau_platform_probe+0x3c/0x9c > [ 2.154200...

...object_mthd+0x1a/0x30 [nouveau] [ 213.302773] nvkm_ioctl_mthd+0x65/0x70 [nouveau] [ 213.307940] nvkm_ioctl+0xf0/0x190 [nouveau] [ 213.312735] nvkm_client_ioctl+0x12/0x20 [nouveau] [ 213.318097] nvif_object_ioctl+0x4f/0x60 [nouveau] [ 213.323460] nvif_object_mthd+0x9f/0x150 [nouveau] [ 213.328822] ? nvif_object_ctor+0x14b/0x1d0 [nouveau] [ 213.334473] nvif_device_ctor+0x61/0x70 [nouveau] [ 213.339749] nouveau_cli_init+0x1a3/0x460 [nouveau] [ 213.345215] ? nouveau_drm_device_init+0x3e/0x780 [nouveau] [ 213.351454] nouveau_drm_device_init+0x77/0x780 [nouveau] [ 213.357479] ? pci_read_config_word+0x27/0x40 [ 213....

...nvkm_device_init+0x10b/0x240 [nouveau] [ 70.135506] nvkm_udevice_init+0x49/0x70 [nouveau] [ 70.135531] nvkm_object_init+0x3d/0x180 [nouveau] [ 70.135555] nvkm_ioctl_new+0x1a1/0x260 [nouveau] [ 70.135578] nvkm_ioctl+0x10a/0x240 [nouveau] [ 70.135600] nvif_object_ctor+0xeb/0x150 [nouveau] [ 70.135622] nvif_device_ctor+0x1f/0x60 [nouveau] [ 70.135668] nouveau_cli_init+0x1ac/0x590 [nouveau] [ 70.135711] nouveau_drm_device_init+0x68/0x800 [nouveau] [ 70.135753] nouveau_drm_probe+0xfb/0x200 [nouveau] [ 70.135761] local_pc...

...vkm_device_init+0x166/0x2e0 [nouveau] nvkm_udevice_init+0x47/0x70 [nouveau] nvkm_object_init+0x41/0x1c0 [nouveau] nvkm_ioctl_new+0x16a/0x290 [nouveau] ? __pfx_nvkm_client_child_new+0x10/0x10 [nouveau] ? __pfx_nvkm_udevice_new+0x10/0x10 [nouveau] nvkm_ioctl+0x126/0x290 [nouveau] nvif_object_ctor+0x112/0x190 [nouveau] nvif_device_ctor+0x23/0x60 [nouveau] nouveau_cli_init+0x164/0x640 [nouveau] nouveau_drm_device_init+0x97/0x9e0 [nouveau] ? srso_return_thunk+0x5/0x5f ? pci_update_current_state+0x72/0xb0 ? srso_return_thunk+0x5/0x5f nouveau_drm_probe+0x12c/0x280 [nouveau]...

...0b/0x240 [nouveau] > [ 70.135506] nvkm_udevice_init+0x49/0x70 [nouveau] > [ 70.135531] nvkm_object_init+0x3d/0x180 [nouveau] > [ 70.135555] nvkm_ioctl_new+0x1a1/0x260 [nouveau] > [ 70.135578] nvkm_ioctl+0x10a/0x240 [nouveau] > [ 70.135600] nvif_object_ctor+0xeb/0x150 [nouveau] > [ 70.135622] nvif_device_ctor+0x1f/0x60 [nouveau] > [ 70.135668] nouveau_cli_init+0x1ac/0x590 [nouveau] > [ 70.135711] nouveau_drm_device_init+0x68/0x800 [nouveau] > [ 70.135753] nouveau_drm_probe+0xfb/0x200 [nouveau] > [ 7...

Hi folks, Currently, when the device is removed (or the driver is unbound) the nouveau_drm structure de-allocated. However, it's still accessible from and used by some DRM layer callbacks. For example, file handles can be closed after the device has been removed (physically or otherwise). This series converts the Nouveau device structure to be allocated and de-allocated with the