search for: nouveau_pmops_thaw

...drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7acd1cf8c5a6..90757af9bc73 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -727,7 +727,7 @@ nouveau_pmops_thaw(struct device *dev) } bool -nouveau_pmops_runtime() +nouveau_pmops_runtime(void) { if (nouveau_runtime_pm == -1) return nouveau_is_optimus() || nouveau_is_v1_dsm(); -- 2.11.0

...drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7acd1cf8c5a6..90757af9bc73 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -727,7 +727,7 @@ nouveau_pmops_thaw(struct device *dev) } bool -nouveau_pmops_runtime() +nouveau_pmops_runtime(void) { if (nouveau_runtime_pm == -1) return nouveau_is_optimus() || nouveau_is_v1_dsm(); -- 2.9.0

...ops_resume(struct device *dev) static int nouveau_pmops_freeze(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct drm_device *drm_dev = pci_get_drvdata(pdev); + struct drm_device *drm_dev = dev_get_drvdata(dev); return nouveau_do_suspend(drm_dev, false); } static int nouveau_pmops_thaw(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct drm_device *drm_dev = pci_get_drvdata(pdev); + struct drm_device *drm_dev = dev_get_drvdata(dev); return nouveau_do_resume(drm_dev, false); } -- 2.20.1

...x5d/0x97 [drm] [ 243.143861] drm_ioctl+0x2d6/0x3a2 [drm] [ 243.143861] ? nouveau_abi16_ioctl_setparam+0xa/0xa [nouveau] [ 243.143861] ? _raw_spin_unlock_irqrestore+0x12/0x2b [ 243.143861] ? __pm_runtime_resume+0x3b/0x45 [ 243.143861] nouveau_drm_ioctl+0x53/0x9a [nouveau] [ 243.143861] ? nouveau_pmops_thaw+0xf/0xf [nouveau] [ 243.143861] do_vfs_ioctl+0x85/0x635 [ 243.143861] ? _raw_spin_unlock+0x10/0x23 [ 243.143861] ? handle_mm_fault+0x67d/0x859 [ 243.143861] ? __fget+0x5c/0x93 [ 243.143861] ? __fget_light+0x43/0x4d [ 243.143861] ksys_ioctl+0x33/0x52 [ 243.143861] sys_ioctl+0x11/0x13 [...

...ruct drm_device *dev, unsigned long flags) if (ret) goto fail_ttm; - ret = nouveau_bios_init(dev); - if (ret) - goto fail_bios; + if (pdev) { + ret = nouveau_bios_init(dev); + if (ret) + goto fail_bios; + } ret = nouveau_display_create(dev); if (ret) @@ -662,7 +684,6 @@ static int nouveau_pmops_thaw(struct device *dev) static int nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) { - struct pci_dev *pdev = dev->pdev; struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_cli *cli; char name[32], tmpname[TASK_COMM_LEN]; @@ -676,7 +697,9 @@ nouveau_drm_open(struct d...

...<c1348798>] ? timerqueue_add+0x58/0xc0 Apr 29 22:16:06 h kernel: [ 78.636425] [<c147b071>] ? __pm_runtime_resume+0x51/0x70 Apr 29 22:16:06 h kernel: [ 78.636425] [<f8faf7cb>] nouveau_drm_ioctl+0x5b/0xb0 [nouveau] Apr 29 22:16:06 h kernel: [ 78.636425] [<f8faf770>] ? nouveau_pmops_thaw+0x20/0x20 [nouveau] Apr 29 22:16:06 h kernel: [ 78.636425] [<c11bdf72>] do_vfs_ioctl+0x322/0x550 Apr 29 22:16:06 h kernel: [ 78.636425] [<c10c1247>] ? hrtimer_start+0x27/0x30 Apr 29 22:16:06 h kernel: [ 78.636425] [<c10c277b>] ? do_setitimer+0x26b/0x270 Apr 29 22:16:06 h...

...s (see nouveau_agp.h) */ - if (drm_pci_device_is_agp(dev) && dev->agp) { + if (pdev && drm_pci_device_is_agp(dev) && dev->agp) { /* dummy device object, doesn't init anything, but allows * agp code access to registers */ @@ -662,7 +685,6 @@ static int nouveau_pmops_thaw(struct device *dev) static int nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) { - struct pci_dev *pdev = dev->pdev; struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_cli *cli; char name[32], tmpname[TASK_COMM_LEN]; @@ -676,7 +698,9 @@ nouveau_drm_open(struct d...

On 12/02/14 05:38, Alexandre Courbot wrote: > Upcoming mobile Kepler GPUs (such as GK20A) use the platform bus instead > of PCI to which Nouveau is tightly dependent. This patch allows Nouveau > to handle platform devices by: > > - abstracting PCI-dependent functions that were typically used for > resource querying and page mapping, > - introducing a nv_device_is_pci()

On Mon, Feb 10, 2014 at 8:50 PM, Thierry Reding <thierry.reding at gmail.com> wrote: > On Mon, Feb 10, 2014 at 02:53:00PM +0900, Alexandre Courbot wrote: > [...] >> diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c > [...] >> +resource_size_t >> +nv_device_resource_start(struct nouveau_device *device,

...ruct drm_device *dev, unsigned long flags) if (ret) goto fail_ttm; - ret = nouveau_bios_init(dev); - if (ret) - goto fail_bios; + if (pdev) { + ret = nouveau_bios_init(dev); + if (ret) + goto fail_bios; + } ret = nouveau_display_create(dev); if (ret) @@ -662,7 +689,6 @@ static int nouveau_pmops_thaw(struct device *dev) static int nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) { - struct pci_dev *pdev = dev->pdev; struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_cli *cli; char name[32], tmpname[TASK_COMM_LEN]; @@ -676,7 +702,9 @@ nouveau_drm_open(struct d...

Hello everyone, GK20A is the Kepler-based GPU used in the upcoming Tegra K1 chips. The following patches perform architectural changes to Nouveau that are necessary to support non-PCI GPUs and add initial support for GK20A. Although the support is still very basic and more user-space changes will be needed to make the full graphics stack run on top of it, we were able to successfully open