search for: cpu_coherent

...h > @@ -175,6 +175,7 @@ struct nvkm_device_func { > void (*fini)(struct nvkm_device *, bool suspend); > resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar); > resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar); > + bool cpu_coherent; > }; > > struct nvkm_device_quirk { > diff --git a/drm/nouveau/nouveau_bo.c b/drm/nouveau/nouveau_bo.c > index 528bdef..6887d0a 100644 > --- a/drm/nouveau/nouveau_bo.c > +++ b/drm/nouveau/nouveau_bo.c > @@ -209,7 +209,8 @@ nouveau_bo_new(struct drm_device *dev, int size,...

...ice.h +++ b/drm/nouveau/include/nvkm/core/device.h @@ -175,6 +175,7 @@ struct nvkm_device_func { void (*fini)(struct nvkm_device *, bool suspend); resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar); resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar); + bool cpu_coherent; }; struct nvkm_device_quirk { diff --git a/drm/nouveau/nouveau_bo.c b/drm/nouveau/nouveau_bo.c index 528bdef..6887d0a 100644 --- a/drm/nouveau/nouveau_bo.c +++ b/drm/nouveau/nouveau_bo.c @@ -209,7 +209,8 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, nvbo->tile_flags = til...

...+175,7 @@ struct nvkm_device_func { >> void (*fini)(struct nvkm_device *, bool suspend); >> resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar); >> resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar); >> + bool cpu_coherent; >> }; >> >> struct nvkm_device_quirk { >> diff --git a/drm/nouveau/nouveau_bo.c b/drm/nouveau/nouveau_bo.c >> index 528bdef..6887d0a 100644 >> --- a/drm/nouveau/nouveau_bo.c >> +++ b/drm/nouveau/nouveau_bo.c >> @@ -209,7 +209,8 @@ nouveau_bo_new(st...

On Mon, Sep 19, 2016 at 12:43 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote: > On Sun, Sep 18, 2016 at 11:39 PM, Alexandre Courbot <gnurou at gmail.com> wrote: >> On Sun, Sep 18, 2016 at 7:21 PM, Karol Herbst <karolherbst at gmail.com> wrote: >>> This reverts commit 01bbcb69f80e1058395b737ae399c6f4ef48691b. > > I think you meant

...iomem *)mem); @@ -1492,14 +1459,6 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm) dev = drm->dev; pdev = device->dev; - /* - * Objects matching this condition have been marked as force_coherent, - * so use the DMA API for them. - */ - if (!nvxx_device(&drm->device)->func->cpu_coherent && - ttm->caching_state == tt_uncached) - return ttm_dma_populate(ttm_dma, dev->dev); - #if IS_ENABLED(CONFIG_AGP) if (drm->agp.bridge) { return ttm_agp_tt_populate(ttm); @@ -1557,16 +1516,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm) dev = drm->dev; pdev = d...

...o Nouveau tree, remove bits in lib/] Signed-off-by: Alexandre Courbot <acourbot at nvidia.com> --- Hi Ben, I have ported this patch to your tree - could you take it for 4.7? We definitely want to avoid these crashes. I am working on a final solution for this that will allow us to remove that cpu_coherent flag altogether. drm/nouveau/nvkm/engine/device/pci.c | 2 +- lib/include/nvif/os.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drm/nouveau/nvkm/engine/device/pci.c b/drm/nouveau/nvkm/engine/device/pci.c index 18fab3973ce5..62ad0300cfa5 100644 --- a/dr...

.../] > Signed-off-by: Alexandre Courbot <acourbot at nvidia.com> > --- > Hi Ben, > > I have ported this patch to your tree - could you take it for 4.7? We definitely want > to avoid these crashes. I am working on a final solution for this that will allow us > to remove that cpu_coherent flag altogether. Cheers Alex! Should this also go to stable for 4.6? Robin. > drm/nouveau/nvkm/engine/device/pci.c | 2 +- > lib/include/nvif/os.h | 6 ------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drm/nouveau/nvkm/engine/device/pci.c...

...ad0300cfa5..18fab3973ce5 100644 --- a/drm/nouveau/nvkm/engine/device/pci.c +++ b/drm/nouveau/nvkm/engine/device/pci.c @@ -1614,7 +1614,7 @@ nvkm_device_pci_func = { .fini = nvkm_device_pci_fini, .resource_addr = nvkm_device_pci_resource_addr, .resource_size = nvkm_device_pci_resource_size, - .cpu_coherent = !IS_ENABLED(CONFIG_ARM), + .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64), }; int -- 2.7.2

...100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c @@ -1614,7 +1614,7 @@ nvkm_device_pci_func = { .fini = nvkm_device_pci_fini, .resource_addr = nvkm_device_pci_resource_addr, .resource_size = nvkm_device_pci_resource_size, - .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64), + .cpu_coherent = !IS_ENABLED(CONFIG_ARM), }; int -- 2.8.1.dirty

Changes since last sent: * add a patch to set the device into DRM_SWITCH_POWER_CHANGING state (can be dropped actually, I thought I was needing it, came up with a different approach and forgot to delete it, doesn't hurt though) * expose information about runtime suspending to nvkm so that we can run the pcie workaround only on runtime suspend Karol Herbst (8): pci: disable ASPM