search for: nouveau_atomic

...9a0bc7..d9da69c83ae7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2126,10 +2126,6 @@ nv50_display_destroy(struct drm_device *dev) kfree(disp); } -MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)"); -static int nouveau_atomic = 0; -module_param_named(atomic, nouveau_atomic, int, 0400); - int nv50_display_create(struct drm_device *dev) { @@ -2154,8 +2150,6 @@ nv50_display_create(struct drm_device *dev) disp->disp = &nouveau_display(dev)->disp; dev->mode_config.funcs = &nv50_disp_func; dev->dr...

...rs/gpu/drm/nouveau/nouveau_drm.c @@ -79,6 +79,10 @@ MODULE_PARM_DESC(modeset, "enable driver (default: auto, " int nouveau_modeset = -1; module_param_named(modeset, nouveau_modeset, int, 0400); +MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)"); +static int nouveau_atomic = 0; +module_param_named(atomic, nouveau_atomic, int, 0400); + MODULE_PARM_DESC(runpm, "disable (0), force enable (1), optimus only default (-1)"); static int nouveau_runtime_pm = -1; module_param_named(runpm, nouveau_runtime_pm, int, 0400); @@ -501,6 +505,9 @@ static int nouveau_drm_p...

...<lyude at redhat.com> wrote: > Hm, one nitpick here. Since /sys/kernel/debug/dri/*/state creation depends on > the driver supporting atomic, maybe it would be good to make it so that we set > DRIVER_ATOMIC in the driver_stub structure, then disable it per-device depending > on the nouveau_atomic setting + hw support. That way we can always have the > state debugfs file while maintaining nouveau's current behavior with exposing > atomic ioctls. Assuming that wouldn't have any unintended side-effects of course dri/*/state only works with atomic drivers. There's no explicit...

From: Ville Syrjälä <ville.syrjala at linux.intel.com> We now have per-device driver_features, so let's use that to disable atomic only for pre-nv50. Cc: Ben Skeggs <bskeggs at redhat.com> Cc: Lyude Paul <lyude at redhat.com> Cc: nouveau at lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter at ffwll.ch> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

...ndif - if (nouveau_modeset != 2) - drm_fb_helper_remove_conflicting_framebuffers(aper, "nouveaufb", boot); - kfree(aper); - - ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug, - true, true, ~0ULL, &device); - if (ret) - return ret; - - pci_set_master(pdev); - - if (nouveau_atomic) - driver_pci.driver_features |= DRIVER_ATOMIC; - - ret = drm_get_pci_dev(pdev, pent, &driver_pci); - if (ret) { - nvkm_device_del(&device); - return ret; - } - - return 0; -} - static int -nouveau_drm_load(struct drm_device *dev, unsigned long flags) +nouveau_drm_device_init(struct drm...

...nouveau_modeset = -1; module_param_named(modeset, nouveau_modeset, int, 0400); +/** + * DOC: atomic (boolean) + * + * Set to ``1`` to enable atomic modesetting support; defaults to ``0`` + * (false). + */ MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)"); static int nouveau_atomic = 0; module_param_named(atomic, nouveau_atomic, int, 0400); +/** + * DOC: runpm (integer) + * + * Control whether or not runtime power management is used. Valid values are: + * + * * ``0`` - Disables runtime power management + * * ``1`` - Forces runtime power management to be enabled + * * ``-1`...

...; struct nvkm_device *device; > struct drm_device *drm_dev; > + struct nouveau_drm *nv_dev; > int ret; > > if (vga_switcheroo_client_probe_defer(pdev)) > @@ -750,15 +746,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > if (nouveau_atomic) > driver_pci.driver_features |= DRIVER_ATOMIC; > > - drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); > - if (IS_ERR(drm_dev)) { > - ret = PTR_ERR(drm_dev); > + nv_dev = devm_drm_dev_alloc(&pdev->dev, &driver_...

...e_conflicting_framebuffers(aper, > "nouveaufb", boot); > - kfree(aper); > - > - ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug, > - true, true, ~0ULL, &device); > - if (ret) > - return ret; > - > - pci_set_master(pdev); > - > - if (nouveau_atomic) > - driver_pci.driver_features |= DRIVER_ATOMIC; > - > - ret = drm_get_pci_dev(pdev, pent, &driver_pci); > - if (ret) { > - nvkm_device_del(&device); > - return ret; > - } > - > - return 0; > -} > - > static int > -nouveau_drm_load(struct drm_devi...

...*); > #endif > diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c > index 3d32afe8a..78d55c525 100644 > --- a/drm/nouveau/nouveau_drm.c > +++ b/drm/nouveau/nouveau_drm.c > @@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > > if (nouveau_atomic) > driver_pci.driver_features |= DRIVER_ATOMIC; > + device->has_runpm = nouveau_pmops_runtime(); > > drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); > if (IS_ERR(drm_dev)) { > diff --git a/drm/nouveau/nvkm/subdev/clk/base.c b/d...

Hm, one nitpick here. Since /sys/kernel/debug/dri/*/state creation depends on the driver supporting atomic, maybe it would be good to make it so that we set DRIVER_ATOMIC in the driver_stub structure, then disable it per-device depending on the nouveau_atomic setting + hw support. That way we can always have the state debugfs file while maintaining nouveau's current behavior with exposing atomic ioctls. Assuming that wouldn't have any unintended side-effects of course On Thu, 2018-09-13 at 19:31 +0300, Ville Syrjala wrote: > From: Ville Syrj...

...b/drm/nouveau/nouveau_drm.c > > > index 3d32afe8a..78d55c525 100644 > > > --- a/drm/nouveau/nouveau_drm.c > > > +++ b/drm/nouveau/nouveau_drm.c > > > @@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > > > > > > if (nouveau_atomic) > > > driver_pci.driver_features |= DRIVER_ATOMIC; > > > + device->has_runpm = nouveau_pmops_runtime(); > > > > > > drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); > > > if (IS_ERR(drm_dev)) { > &...

...uot;nouveaufb", boot); >> - kfree(aper); >> - >> - ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug, >> - true, true, ~0ULL, &device); >> - if (ret) >> - return ret; >> - >> - pci_set_master(pdev); >> - >> - if (nouveau_atomic) >> - driver_pci.driver_features |= DRIVER_ATOMIC; >> - >> - ret = drm_get_pci_dev(pdev, pent, &driver_pci); >> - if (ret) { >> - nvkm_device_del(&device); >> - return ret; >> - } >> - >> - return 0; >> -} >> - >> s...

...nouveau_modeset = -1; module_param_named(modeset, nouveau_modeset, int, 0400); +/** + * DOC: atomic (boolean) + * + * Set to ``1`` to enable atomic modesetting support; defaults to ``0`` + * (false). + */ MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)"); static int nouveau_atomic = 0; module_param_named(atomic, nouveau_atomic, int, 0400); +/** + * DOC: runpm (integer) + * + * Control whether or not runtime power management is used. Valid values are: + * + * * ``0`` - Disables runtime power management + * * ``1`` - Forces runtime power management to be enabled + * * ``-1`...

...-720,6 +715,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, { struct nvkm_device *device; struct drm_device *drm_dev; + struct nouveau_drm *nv_dev; int ret; if (vga_switcheroo_client_probe_defer(pdev)) @@ -750,15 +746,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev, if (nouveau_atomic) driver_pci.driver_features |= DRIVER_ATOMIC; - drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); - if (IS_ERR(drm_dev)) { - ret = PTR_ERR(drm_dev); + nv_dev = devm_drm_dev_alloc(&pdev->dev, &driver_stub, typeof(*nv_dev), drm_dev); + if (IS_ERR(nv_dev)) { + ret = PTR_ER...

...odeset, nouveau_modeset, int, 0400); > > +/** > + * DOC: atomic (boolean) > + * > + * Set to ``1`` to enable atomic modesetting support; defaults to ``0`` > + * (false). > + */ > MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)"); > static int nouveau_atomic = 0; > module_param_named(atomic, nouveau_atomic, int, 0400); > > +/** > + * DOC: runpm (integer) > + * > + * Control whether or not runtime power management is used. Valid values are: > + * > + * * ``0`` - Disables runtime power management > + * * ``1`` - Forces runtime...

This series is intended to add support for shutting down the GPU on kernel shutdown/reboot using the ->shutdown() hook, similar to what amdgpu does. This is mainly intended to workaround a bios issue on the P50 that was preventing nouveau from initializing the dedicated GM107 GPU on that system properly. You can find more details on this issue in the patch labeled "Shut down GPU on kernel

not much changed since the last time I sent those patches out, but there are a couple of annoying bug fixes, which users would probably never hit unless they do rmmod/modprobe nouveau cycles. Biggest change is that I force the link to a 8.0 speed rather than the speed the GPU came up with. Also this series depends on the PCIe improvement patches I sent out recently. Karol Herbst (4): pci:

...e_speed nvkm_pcie_get_speed(struct nvkm_pci *); #endif diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c index 3d32afe8a..78d55c525 100644 --- a/drm/nouveau/nouveau_drm.c +++ b/drm/nouveau/nouveau_drm.c @@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, if (nouveau_atomic) driver_pci.driver_features |= DRIVER_ATOMIC; + device->has_runpm = nouveau_pmops_runtime(); drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); if (IS_ERR(drm_dev)) { diff --git a/drm/nouveau/nvkm/subdev/clk/base.c b/drm/nouveau/nvkm/subdev/clk/base.c index ba6a868d4..e30e7745...

...it a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c > > index 3d32afe8a..78d55c525 100644 > > --- a/drm/nouveau/nouveau_drm.c > > +++ b/drm/nouveau/nouveau_drm.c > > @@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > > > > if (nouveau_atomic) > > driver_pci.driver_features |= DRIVER_ATOMIC; > > + device->has_runpm = nouveau_pmops_runtime(); > > > > drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); > > if (IS_ERR(drm_dev)) { > > diff --git a/drm/nouv...

...gt; > > > index 3d32afe8a..78d55c525 100644 > > > > --- a/drm/nouveau/nouveau_drm.c > > > > +++ b/drm/nouveau/nouveau_drm.c > > > > @@ -676,6 +676,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, > > > > > > > > if (nouveau_atomic) > > > > driver_pci.driver_features |= DRIVER_ATOMIC; > > > > + device->has_runpm = nouveau_pmops_runtime(); > > > > > > > > drm_dev = drm_dev_alloc(&driver_pci, &pdev->dev); > > > > if (...