[Nouveau] [PATCH] drm/nvc0/pm: read core/shader/memory clocks (more) correctly
--- drivers/gpu/drm/nouveau/nouveau_perf.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 950caba..d64a98a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -177,9 +177,9 @@ nouveau_perf_init(struct drm_device *dev) #define subent(n) entry[perf[2] + ((n) * perf[3])] perflvl-fanspeed = 0; /*XXX*/ perflvl-voltage = entry[2]; - perflvl-core = (ROM16(subent(0)) 0xfff) * 1000; - perflvl-shader = (ROM16(subent(1)) 0xfff) * 1000; - perflvl-memory = (ROM16(subent(2)) 0xfff) * 1000; + perflvl-core = (ROM16(subent(3)) 0xfff) * 1000; + perflvl-shader = (ROM16(subent(3)) 0xfff) / 2 * 1000; + perflvl-memory = (ROM16(subent(5)) 0xfff) * 1000; break; } -- 1.7.4.4 ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [PATCH] drm/nouveau: Fix a complier warning in the card init error path
Fix an unitialized variable complier warning in nouveau_card_init.
Signed-off-by: Jimmy Rentz jb17bs...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index 3404950..66e8037 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -679,7 +679,7 @@ out_fifo:
engine-fifo.takedown(dev);
out_engine:
if (!nouveau_noaccel) {
- for (e = e - 1; e = 0; e--) {
+ for (e = NVOBJ_ENGINE_NR - 1; e = 0; e--) {
if (!dev_priv-eng[e])
continue;
dev_priv-eng[e]-fini(dev, e);
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [PATCH] drm/nouveau: Free nv04 instmem ramin heap at card takedown
Add a missing nv04 instmem ramin heap shutdown call. Signed-off-by: Jimmy Rentz jb17bs...@gmail.com diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c index b8e3edb..b8611b9 100644 --- a/drivers/gpu/drm/nouveau/nv04_instmem.c +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c @@ -95,6 +95,9 @@ nv04_instmem_takedown(struct drm_device *dev) nouveau_ramht_ref(NULL, dev_priv-ramht, NULL); nouveau_gpuobj_ref(NULL, dev_priv-ramro); nouveau_gpuobj_ref(NULL, dev_priv-ramfc); + + if (drm_mm_initialized(dev_priv-ramin_heap)) + drm_mm_takedown(dev_priv-ramin_heap); } int ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [PATCH] drm/nouveau: Fix a crash at card takedown for NV40 and older cards trying to free a vga bo
NV40 and older cards (pre NV50) reserve a vram bo for the vga memory at
card init. This bo is then freed at card shutdown. The problem is that
the ttm bo vram manager was already freed. So a crash occurs when the
vga bo is freed. The fix is to free the vga bo prior to freeing the ttm
bo vram manager. There might be other solutions but this seemed the
simplest to me.
Signed-off-by: Jimmy Rentz jb17bs...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c
b/drivers/gpu/drm/nouveau/nouveau_mem.c index 9c7bc3f..ce3cb5e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -154,8 +154,6 @@ nouveau_mem_vram_fini(struct drm_device *dev)
{
struct drm_nouveau_private *dev_priv = dev-dev_private;
- nouveau_bo_ref(NULL, dev_priv-vga_ram);
-
ttm_bo_device_release(dev_priv-ttm.bdev);
nouveau_ttm_global_release(dev_priv);
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c index 66e8037..98ab6b2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -738,6 +738,11 @@ static void nouveau_card_takedown(struct
drm_device *dev) engine-mc.takedown(dev);
engine-display.late_takedown(dev);
+ if (dev_priv-vga_ram) {
+ nouveau_bo_unpin(dev_priv-vga_ram);
+ nouveau_bo_ref(NULL, dev_priv-vga_ram);
+ }
+
mutex_lock(dev-struct_mutex);
ttm_bo_clean_mm(dev_priv-ttm.bdev, TTM_PL_VRAM);
ttm_bo_clean_mm(dev_priv-ttm.bdev, TTM_PL_TT);
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 36330] New: 2.6.38 kernel fails to boot with nouveau driver active
https://bugs.freedesktop.org/show_bug.cgi?id=36330 Summary: 2.6.38 kernel fails to boot with nouveau driver active Product: xorg Version: unspecified Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/nouveau AssignedTo: nouveau@lists.freedesktop.org ReportedBy: ghu...@web.de QAContact: xorg-t...@lists.x.org Created an attachment (id=45742) -- (https://bugs.freedesktop.org/attachment.cgi?id=45742) my kernel config for a 2.6.38.2 vanilla kernel Hello! My 2.6.38 kernel fails to boot when using the nouveau driver. See these pictures of the kernel output while booting: http://tinypic.com/r/xefq6e/7 http://tinypic.com/r/2w5kc8w/7 http://tinypic.com/r/30wmlmv/7 I made 3 pictures because I wanted to show the effect of the shifted text in the fullscreen picture where you can barely read the text. The other two pictures show the text. I am running gentoo linux and I used kernel 2.6.37 for quite a while with no problems but was not able to produce a working 2.6.38 kernel. I have tried the gentoo-sources-2.6.38-r1 and also a vanilla 2.6.38.2 kernel and the behaviour is the same for both. I have attached my kernel config. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 36330] 2.6.38 kernel fails to boot with nouveau driver active
https://bugs.freedesktop.org/show_bug.cgi?id=36330 --- Comment #1 from ghu...@web.de 2011-04-17 13:50:00 PDT --- Looks like I found the culprit: In a desperate attempt I have deactivated the boot logo display in my kernel and now it boots with no problems. Please tell me if and how I can help debugging this. For the moment I can perfectly live without the boot logo but I would like to contribute something to nouveau development if I can. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nouveau: Fix a complier warning in the card init error path
On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
Fix an unitialized variable complier warning in nouveau_card_init.
Signed-off-by: Jimmy Rentz jb17bs...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index 3404950..66e8037 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -679,7 +679,7 @@ out_fifo:
engine-fifo.takedown(dev);
out_engine:
if (!nouveau_noaccel) {
- for (e = e - 1; e = 0; e--) {
+ for (e = NVOBJ_ENGINE_NR - 1; e = 0; e--) {
if (!dev_priv-eng[e])
continue;
dev_priv-eng[e]-fini(dev, e);
This code is supposed to handle the situation when one of engine initialization
routines failed and this change will break it...
Marcin
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 36330] 2.6.38 kernel fails to boot with nouveau driver active
https://bugs.freedesktop.org/show_bug.cgi?id=36330 --- Comment #2 from Marcin Slusarz marcin.slus...@gmail.com 2011-04-17 14:28:27 PDT --- This is probably the same bug which was reported recently: https://lkml.org/lkml/2011/4/15/27 https://bugs.freedesktop.org/show_bug.cgi?id=36248 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 36330] 2.6.38 kernel fails to boot with nouveau driver active
https://bugs.freedesktop.org/show_bug.cgi?id=36330 Marcin Slusarz marcin.slus...@gmail.com changed: What|Removed |Added Attachment #45742|application/octet-stream|text/plain mime type|| -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nouveau: Fix a complier warning in the card init error path
On Sun, 17 Apr 2011 23:18:36 +0200
Marcin Slusarz marcin.slus...@gmail.com wrote:
On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
Fix an unitialized variable complier warning in nouveau_card_init.
Signed-off-by: Jimmy Rentz jb17bs...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c index 3404950..66e8037
100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -679,7 +679,7 @@ out_fifo:
engine-fifo.takedown(dev);
out_engine:
if (!nouveau_noaccel) {
- for (e = e - 1; e = 0; e--) {
+ for (e = NVOBJ_ENGINE_NR - 1; e = 0; e--) {
if (!dev_priv-eng[e])
continue;
dev_priv-eng[e]-fini(dev, e);
This code is supposed to handle the situation when one of engine
initialization routines failed and this change will break it...
Marcin
Really? It wasn't intentional. I didn't see the e referenced above.
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nvc0/pm: read core/shader/memory clocks (more) correctly
On Sun, 2011-04-17 at 17:10 +0200, Martin Peres wrote: --- drivers/gpu/drm/nouveau/nouveau_perf.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 950caba..d64a98a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -177,9 +177,9 @@ nouveau_perf_init(struct drm_device *dev) #define subent(n) entry[perf[2] + ((n) * perf[3])] perflvl-fanspeed = 0; /*XXX*/ perflvl-voltage = entry[2]; - perflvl-core = (ROM16(subent(0)) 0xfff) * 1000; - perflvl-shader = (ROM16(subent(1)) 0xfff) * 1000; - perflvl-memory = (ROM16(subent(2)) 0xfff) * 1000; + perflvl-core = (ROM16(subent(3)) 0xfff) * 1000; + perflvl-shader = (ROM16(subent(3)) 0xfff) / 2 * 1000; + perflvl-memory = (ROM16(subent(5)) 0xfff) * 1000; Um, NACK. This is *definitely* very very wrong on NVA8, which uses version 0x40 of this table too. Ben. break; } ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nvc0/pm: read core/shader/memory clocks (more) correctly
Le 18/04/2011 00:32, Ben Skeggs a écrit : On Sun, 2011-04-17 at 17:10 +0200, Martin Peres wrote: --- drivers/gpu/drm/nouveau/nouveau_perf.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 950caba..d64a98a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -177,9 +177,9 @@ nouveau_perf_init(struct drm_device *dev) #define subent(n) entry[perf[2] + ((n) * perf[3])] perflvl-fanspeed = 0; /*XXX*/ perflvl-voltage = entry[2]; - perflvl-core = (ROM16(subent(0)) 0xfff) * 1000; - perflvl-shader = (ROM16(subent(1)) 0xfff) * 1000; - perflvl-memory = (ROM16(subent(2)) 0xfff) * 1000; + perflvl-core = (ROM16(subent(3)) 0xfff) * 1000; + perflvl-shader = (ROM16(subent(3)) 0xfff) / 2 * 1000; + perflvl-memory = (ROM16(subent(5)) 0xfff) * 1000; Um, NACK. This is *definitely* very very wrong on NVA8, which uses version 0x40 of this table too. Ben. Crap, I would have sworn this table was introduced for Fermi! Sorry for the noise then, I'll try to find a fix for that (other than looking at the codename). ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nvc0/pm: read core/shader/memory clocks (more) correctly
On Mon, 2011-04-18 at 00:54 +0200, Martin Peres wrote: Le 18/04/2011 00:32, Ben Skeggs a écrit : On Sun, 2011-04-17 at 17:10 +0200, Martin Peres wrote: --- drivers/gpu/drm/nouveau/nouveau_perf.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 950caba..d64a98a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -177,9 +177,9 @@ nouveau_perf_init(struct drm_device *dev) #define subent(n) entry[perf[2] + ((n) * perf[3])] perflvl-fanspeed = 0; /*XXX*/ perflvl-voltage = entry[2]; - perflvl-core = (ROM16(subent(0)) 0xfff) * 1000; - perflvl-shader = (ROM16(subent(1)) 0xfff) * 1000; - perflvl-memory = (ROM16(subent(2)) 0xfff) * 1000; + perflvl-core = (ROM16(subent(3)) 0xfff) * 1000; + perflvl-shader = (ROM16(subent(3)) 0xfff) / 2 * 1000; + perflvl-memory = (ROM16(subent(5)) 0xfff) * 1000; Um, NACK. This is *definitely* very very wrong on NVA8, which uses version 0x40 of this table too. Ben. Crap, I would have sworn this table was introduced for Fermi! Sorry for the noise then, I'll try to find a fix for that (other than looking at the codename). I'm highly skeptical that it's correct on fermi too, but, I can't check that myself right now. I shall do it during the week however. Ben. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nouveau: Fix a complier warning in the card init error path
On Sun, 2011-04-17 at 18:27 -0400, Jimmy Rentz wrote:
On Sun, 17 Apr 2011 23:18:36 +0200
Marcin Slusarz marcin.slus...@gmail.com wrote:
On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
Fix an unitialized variable complier warning in nouveau_card_init.
Signed-off-by: Jimmy Rentz jb17bs...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c index 3404950..66e8037
100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -679,7 +679,7 @@ out_fifo:
engine-fifo.takedown(dev);
out_engine:
if (!nouveau_noaccel) {
- for (e = e - 1; e = 0; e--) {
+ for (e = NVOBJ_ENGINE_NR - 1; e = 0; e--) {
if (!dev_priv-eng[e])
continue;
dev_priv-eng[e]-fini(dev, e);
This code is supposed to handle the situation when one of engine
initialization routines failed and this change will break it...
Marcin
Really? It wasn't intentional. I didn't see the e referenced above.
It's used above, but I don't think it's actually an error. The
situation where it's uninitialised can't actually happen
I pushed a patch that'll silence any compiler that may be complaining.
Ben.
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nouveau: Free nv04 instmem ramin heap at card takedown
On Sun, 2011-04-17 at 16:15 -0400, Jimmy Rentz wrote: Add a missing nv04 instmem ramin heap shutdown call. Thank you, pushed this and the vga_ram patch. Ben. Signed-off-by: Jimmy Rentz jb17bs...@gmail.com diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c index b8e3edb..b8611b9 100644 --- a/drivers/gpu/drm/nouveau/nv04_instmem.c +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c @@ -95,6 +95,9 @@ nv04_instmem_takedown(struct drm_device *dev) nouveau_ramht_ref(NULL, dev_priv-ramht, NULL); nouveau_gpuobj_ref(NULL, dev_priv-ramro); nouveau_gpuobj_ref(NULL, dev_priv-ramfc); + + if (drm_mm_initialized(dev_priv-ramin_heap)) + drm_mm_takedown(dev_priv-ramin_heap); } int ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH] drm/nvc0/pm: read core/shader/memory clocks (more) correctly
Le 18/04/2011 00:56, Ben Skeggs a écrit : On Mon, 2011-04-18 at 00:54 +0200, Martin Peres wrote: Le 18/04/2011 00:32, Ben Skeggs a écrit : On Sun, 2011-04-17 at 17:10 +0200, Martin Peres wrote: --- drivers/gpu/drm/nouveau/nouveau_perf.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 950caba..d64a98a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -177,9 +177,9 @@ nouveau_perf_init(struct drm_device *dev) #define subent(n) entry[perf[2] + ((n) * perf[3])] perflvl-fanspeed = 0; /*XXX*/ perflvl-voltage = entry[2]; - perflvl-core = (ROM16(subent(0)) 0xfff) * 1000; - perflvl-shader = (ROM16(subent(1)) 0xfff) * 1000; - perflvl-memory = (ROM16(subent(2)) 0xfff) * 1000; + perflvl-core = (ROM16(subent(3)) 0xfff) * 1000; + perflvl-shader = (ROM16(subent(3)) 0xfff) / 2 * 1000; + perflvl-memory = (ROM16(subent(5)) 0xfff) * 1000; Um, NACK. This is *definitely* very very wrong on NVA8, which uses version 0x40 of this table too. Ben. Crap, I would have sworn this table was introduced for Fermi! Sorry for the noise then, I'll try to find a fix for that (other than looking at the codename). I'm highly skeptical that it's correct on fermi too, but, I can't check that myself right now. I shall do it during the week however. Ben. I was also highly skeptical about this, but I looked at all the vbios and it seemed good on all of them. Then, I looked at tools like nibitor or Fermi bios editor (http://www.xtremesystems.org/forums/showthread.php?t=256367) which also highlights the subentries 3 and 5. I'll look further and try to see if ramcfg could help us select the right subentries. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 31169] no image when booting / G86 [GeForce 8400M GS]
https://bugs.freedesktop.org/show_bug.cgi?id=31169 --- Comment #10 from Ben Skeggs skeg...@gmail.com 2011-04-17 17:58:35 PDT --- Ok, nouveau git has a couple of patches now that should make using these options unnecessary. Are you able to test them please! -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [PATCH] drm/nouveau: Rename bit_table()
Rename bit_table() to find_bit_table() to make the
if easier on the eyes, as well as to remove duplication
i.e. existing struct already has the same name
Signed-off-by: Emil Velikov emil.l.veli...@gmail.com
---
drivers/gpu/drm/nouveau/nouveau_bios.c |4 ++--
drivers/gpu/drm/nouveau/nouveau_bios.h |2 +-
drivers/gpu/drm/nouveau/nouveau_mem.c |2 +-
drivers/gpu/drm/nouveau/nouveau_perf.c |2 +-
drivers/gpu/drm/nouveau/nouveau_temp.c |2 +-
drivers/gpu/drm/nouveau/nouveau_volt.c |2 +-
drivers/gpu/drm/nouveau/nv50_pm.c |2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c
b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 8486dc6..9cb09ee 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -5493,7 +5493,7 @@ struct bit_table {
#define BIT_TABLE(id, funcid) ((struct bit_table){ id,
parse_bit_##funcid##_tbl_entry })
int
-bit_table(struct drm_device *dev, u8 id, struct bit_entry *bit)
+find_bit_table(struct drm_device *dev, u8 id, struct bit_entry *bit)
{
struct drm_nouveau_private *dev_priv = dev-dev_private;
struct nvbios *bios = dev_priv-vbios;
@@ -5524,7 +5524,7 @@ parse_bit_table(struct nvbios *bios, const uint16_t
bitoffset,
struct drm_device *dev = bios-dev;
struct bit_entry bitentry;
- if (bit_table(dev, table-id, bitentry) == 0)
+ if (find_bit_table(dev, table-id, bitentry) == 0)
return table-parse_fn(dev, bios, bitentry);
NV_INFO(dev, BIT table '%c' not found\n, table-id);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h
b/drivers/gpu/drm/nouveau/nouveau_bios.h
index 8a54fa7..2516ac4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -46,7 +46,7 @@ struct bit_entry {
uint8_t *data;
};
-int bit_table(struct drm_device *, u8 id, struct bit_entry *);
+int find_bit_table(struct drm_device *, u8 id, struct bit_entry *);
struct dcb_i2c_entry {
uint32_t entry;
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c
b/drivers/gpu/drm/nouveau/nouveau_mem.c
index ce3cb5e..b424218 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -557,7 +557,7 @@ nouveau_mem_timing_init(struct drm_device *dev)
int i, recordlen, entries;
if (bios-type == NVBIOS_BIT) {
- if (bit_table(dev, 'P', P))
+ if (find_bit_table(dev, 'P', P))
return;
if (P.version == 1)
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c
b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 670e3cb..0457ae7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -84,7 +84,7 @@ nouveau_perf_init(struct drm_device *dev)
int vid, i;
if (bios-type == NVBIOS_BIT) {
- if (bit_table(dev, 'P', P))
+ if (find_bit_table(dev, 'P', P))
return;
if (P.version != 1 P.version != 2) {
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c
b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 649b041..db6a091 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -284,7 +284,7 @@ nouveau_temp_init(struct drm_device *dev)
u8 *temp = NULL;
if (bios-type == NVBIOS_BIT) {
- if (bit_table(dev, 'P', P))
+ if (find_bit_table(dev, 'P', P))
return;
if (P.version == 1)
diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c
b/drivers/gpu/drm/nouveau/nouveau_volt.c
index 75e8727..49b100d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_volt.c
+++ b/drivers/gpu/drm/nouveau/nouveau_volt.c
@@ -113,7 +113,7 @@ nouveau_volt_init(struct drm_device *dev)
int i, headerlen, recordlen, entries, vidmask, vidshift;
if (bios-type == NVBIOS_BIT) {
- if (bit_table(dev, 'P', P))
+ if (find_bit_table(dev, 'P', P))
return;
if (P.version == 1)
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c
b/drivers/gpu/drm/nouveau/nv50_pm.c
index 8a28100..424361e 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -111,7 +111,7 @@ nv50_pm_clock_set(struct drm_device *dev, void *pre_state)
int P = state-P;
if (state-type == PLL_MEMORY perflvl-memscript
- bit_table(dev, 'M', BIT_M) == 0
+ find_bit_table(dev, 'M', BIT_M) == 0
BIT_M.version == 1 BIT_M.length = 0x0b) {
script = ROM16(BIT_M.data[0x05]);
if (script)
--
1.7.1
___
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [Bug 27398] displayport: x server does not draw anything on ThinkPad T410
https://bugs.freedesktop.org/show_bug.cgi?id=27398 --- Comment #5 from Arun Raghavan a...@accosted.net 2011-04-17 21:43:07 PDT --- Created an attachment (id=45754) -- (https://bugs.freedesktop.org/attachment.cgi?id=45754) dmesg output on macbook pro I see the same problem here with a MacBook Pro and a display connected to the mini DisplayPort via a mini-DP-VGA adapter. Attaching kernel log, fwiw. The bits about not being able to get the EDID are the same as the original reporter. Happy to help test/debug. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
