search for: nouveau_card_init

...--------- 1 files changed, 48 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 2ed41d3..9fc5824 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -317,7 +317,7 @@ nouveau_card_init(struct drm_device *dev) /* Initialise internal driver API hooks */ ret = nouveau_init_engine_ptrs(dev); if (ret) - return ret; + goto out; engine = &dev_priv->engine; dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED; @@ -325,12 +325,12 @@ nouveau_card_init(struct drm_device *...

...--------- 1 files changed, 27 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 2ed41d3..25d207c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -317,7 +317,7 @@ nouveau_card_init(struct drm_device *dev) /* Initialise internal driver API hooks */ ret = nouveau_init_engine_ptrs(dev); if (ret) - return ret; + goto out; engine = &dev_priv->engine; dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED; @@ -325,12 +325,12 @@ nouveau_card_init(struct drm_device *...

Signed-off-by: Marcin Ko?cielnicki <koriakin at 0x04.net> --- drivers/gpu/drm/nouveau/nv04_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index 396ee92..d561d77 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c @@ -543,7 +543,7 @@

...re_get+0x20/0x1a7 [ 2417.746738] [<ffffffffa00963f2>] ttm_bo_init+0x234/0x385 [ttm] [ 2417.746743] [<ffffffffa00b67e4>] nouveau_bo_new+0x366/0x3eb [nouveau] [ 2417.746750] [<ffffffffa00ad341>] nouveau_mem_init+0x262/0x44a [nouveau] [ 2417.746756] [<ffffffffa00ab8b6>] nouveau_card_init+0xa73/0xd7e [nouveau] [ 2417.746761] [<ffffffffa00ac27b>] nouveau_load+0x6ba/0x70a [nouveau] [ 2417.746766] [<ffffffff8129b613>] drm_get_dev+0x470/0x5a1 [ 2417.746769] [<ffffffffa0108b24>] nouveau_pci_probe+0x10/0x12 [nouveau] [ 2417.746778] [<ffffffff8121f2c7>] loca...

.../nouveau/nouveau_state.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 1cdfd6e..1866dbb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -731,7 +731,6 @@ nouveau_card_init(struct drm_device *dev) case 0xa3: case 0xa5: case 0xa8: - case 0xaf: nva3_copy_create(dev); break; } -- 1.7.11.4

...May 14 19:17:28 max-desktop kernel: [ 3.741655] [<d8a21420>] nouveau_channel_free+0x60/0x1f0 [nouveau] May 14 19:17:28 max-desktop kernel: [ 3.741700] [<d8a21a8e>] nouveau_channel_alloc+0x39e/0x450 [nouveau] May 14 19:17:28 max-desktop kernel: [ 3.741745] [<d8a207fb>] nouveau_card_init_channel+0x3b/0x170 [nouveau] May 14 19:17:28 max-desktop kernel: [ 3.741839] [<d891ac44>] ? drm_vblank_init+0x104/0x190 [drm] May 14 19:17:28 max-desktop kernel: [ 3.741884] [<d8a20bbc>] nouveau_card_init+0x28c/0x2c0 [nouveau] May 14 19:17:28 max-desktop kernel: [ 3.741927]...

.../nouveau/nouveau_state.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 19706f0..b466937 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -731,7 +731,6 @@ nouveau_card_init(struct drm_device *dev) case 0xa3: case 0xa5: case 0xa8: - case 0xaf: nva3_copy_create(dev); break; }

...card_type) { case NV_50: nv50_fbcon_accel_init(info); diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index f2d0187..241e24d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -427,15 +427,19 @@ nouveau_card_init(struct drm_device *dev) if (ret) goto out_timer; - /* PGRAPH */ - ret = engine->graph.init(dev); - if (ret) - goto out_fb; + if (nouveau_noaccel) + engine->graph.accel_blocked = true; + else { + /* PGRAPH */ + ret = engine->graph.init(dev); + if (ret) + goto out_fb; - /* PF...

...ur a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c --- a/drivers/gpu/drm/nouveau/nouveau_state.c 2010-01-18 12:49:06.825872912 +0100 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c 2010-01-18 13:00:34.039879476 +0100 @@ -385,11 +385,9 @@ dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED; /* Parse BIOS tables / Run init tables if card not POSTed */ - if (drm_core_check_feature(dev, DRIVER_MODESET)) { - ret = nouveau_bios_init(dev); - if (ret) - goto out; - } + ret = nouveau_bios_init(dev); + if (ret) + goto out; ret = nouveau_gpuobj_early_init(dev); if (ret) @...

...ck(&dev_priv->reset_lock); + +out: + return -EAGAIN; +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index afec760..2fac5e5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -697,6 +697,8 @@ nouveau_card_init(struct drm_device *dev) if (ret) goto out; engine = &dev_priv->engine; + intr_rwsem_init(&dev_priv->ioctls_rwsem); + mutex_init(&dev_priv->reset_lock); spin_lock_init(&dev_priv->channels.lock); spin_lock_init(&dev_priv->tile.lock); spin_lock_init(&amp...

We want to be able to guarantee the location of the allocated buffer object if we're going to be able to reliably allocate the existing framebuffer at startup. Add an argument to do so and pass that through to the ttm core. Signed-off-by: Matthew Garrett <mjg at redhat.com> --- drivers/bcma/main.c | 1 - drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +++++++-

...81001dde6000, task ffff81003d9c94f0) Stack: ffff810020fe5000 0000000000000000 ffff810020fe5430 0000000000000000 ffff810020fe5020 ffffffff885ada6b 0000000000200200 ffffffff885ddea0 ffff810021100000 0000000000006440 ffff81001dde7c88 ffff81002eea5a80 Call Trace: [<ffffffff885ada6b>] :nouveau:nouveau_card_init+0x716/0x7f7 [<ffffffff885adb4c>] :nouveau:nouveau_ioctl_card_init+0x0/0x5 [<ffffffff88586571>] :drm:drm_unlocked_ioctl+0x19b/0x215 [<ffffffff88132a44>] :xfs:xfs_iunlock+0x2a/0x79 [<ffffffff8815968e>] :xfs:xfs_write+0xa32/0xa7c [<ffffffff80274325>] __vmalloc_area_n...

...ck(&dev_priv->reset_lock); + +out: + return -EAGAIN; +} diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index afec760..2e981a8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -697,6 +697,7 @@ nouveau_card_init(struct drm_device *dev) if (ret) goto out; engine = &dev_priv->engine; + mutex_init(&dev_priv->reset_lock); spin_lock_init(&dev_priv->channels.lock); spin_lock_init(&dev_priv->tile.lock); spin_lock_init(&dev_priv->context_switch_lock); @@ -886,6 +887,...

...iv->context_switch_lock, flags); return IRQ_HANDLED; } diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 3586667..0a2a437 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -383,7 +383,7 @@ nouveau_card_init(struct drm_device *dev) goto out; engine = &dev_priv->engine; dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED; - spin_lock_init(&dev_priv->engine.lock); + spin_lock_init(&dev_priv->context_switch_lock); /* Parse BIOS tables / Run init tables if card not POSTed */...

...40>] nouveau_bo_new+0x29a/0x396 [nouveau] [ 14.072749] [<f8217ea5>] ? nouveau_bo_new+0x2ff/0x396 [nouveau] [ 14.072766] [<f8163662>] ? drm_mm_put_block+0x1aa/0x228 [drm] [ 14.072792] [<f8211a94>] nouveau_mem_init+0x25b/0x3b7 [nouveau] [ 14.072818] [<f8210533>] nouveau_card_init+0x9b6/0xc98 [nouveau] [ 14.072843] [<f8210b8c>] nouveau_load+0x377/0x3c3 [nouveau] [ 14.072861] [<f8160978>] drm_get_dev+0x2f6/0x42b [drm] [ 14.072888] [<f8249e7a>] cleanup_module+0xb6/0xb8 [nouveau] [ 14.072898] [<c11aeb42>] local_pci_probe+0x13/0x15 [ 14.0729...

...0x4C #define NV40_RAMFC_UNK_50 0x50 + diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 0b6002c..c9f4329 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -363,6 +363,11 @@ nouveau_card_init(struct drm_device *dev) ret = nouveau_dma_channel_init(dev); if (ret) return ret; + ret = nouveau_backlight_init(dev); + if (ret) + DRM_ERROR("Error code %d when trying to register backlight\n", + ret); + dev_priv->init_state = NOUVEAU_CARD_INIT_DONE; return 0; } @@ -37...

...initial_config+0x175/0x1a4 [drm_kms_helper] [ 956.066579] [<f889fec8>] ? NVWriteVgaCrtc+0x79/0x99 [nouveau] [ 956.066579] [<f885bd48>] ? NVWriteVgaSeq+0x22/0x38 [nouveau] [ 956.066579] [<f886af86>] ? nouveau_fbcon_init+0xda/0xe2 [nouveau] [ 956.066579] [<f88528ee>] ? nouveau_card_init+0x1247/0x1363 [nouveau] [ 956.066579] [<f8853049>] ? nouveau_load+0x577/0x5af [nouveau] [ 956.066579] [<f8120ef2>] ? drm_get_pci_dev+0x137/0x22e [drm] [ 956.066579] [<c1031a6d>] ? __blocking_notifier_call_chain+0x47/0x4f [ 956.066579] [<f88b158c>] ? nouveau_acpi_edid...

...include "nouveau_drv.h" #include "nouveau_drm.h" #include "nv50_display.h" +#include "nouveau_thermal.h" static int nouveau_stub_init(struct drm_device *dev) { return 0; } static void nouveau_stub_takedown(struct drm_device *dev) {} @@ -434,8 +435,10 @@ nouveau_card_init(struct drm_device *dev) dev_priv->init_state = NOUVEAU_CARD_INIT_DONE; - if (drm_core_check_feature(dev, DRIVER_MODESET)) + if (drm_core_check_feature(dev, DRIVER_MODESET)) { drm_helper_initial_config(dev); + nouveau_thermal_init(dev); + } return 0; } @@ -470,8 +473,10 @@ static v...

nouveau_bo_wait will make the GPU channel wait for fence if possible, otherwise falling back to waiting with the CPU using ttm_bo_wait. The nouveau_fence_sync function currently returns -ENOSYS, and is the focus of the next patch. Signed-off-by: Luca Barbieri <luca at luca-barbieri.com> --- drivers/gpu/drm/nouveau/nouveau_bo.c | 68 ++++++++++++++++++++++++++++++-

...d_ioctl] pid=6567, cmd=0xc0106426, nr=0x26, dev 0xe200, auth=1 Aug 6 21:11:46 localhost [drm:drm_unlocked_ioctl] pid=6567, cmd=0xc0106426, nr=0x26, dev 0xe200, auth=1 Aug 6 21:11:46 localhost [drm:drm_unlocked_ioctl] pid=6567, cmd=0x6440, nr=0x40, dev 0xe200, auth=1 Aug 6 21:11:46 localhost [drm:nouveau_card_init] prev state = 0 Aug 6 21:11:46 localhost [drm:drm_addmap_core] offset = 0xc8000000, size = 0x04000000, type = 1 Aug 6 21:11:46 localhost [drm:nouveau_init_card_mappings] regs mapped ok at 0xc8000000 Aug 6 21:11:46 localhost [drm:drm_addmap_core] offset = 0xcc000000, size = 0x01000000, type = 1 A...