[patch] nouveau: unwind on load errors
On Thu, Jul 29, 2010 at 08:02:31PM +0200, Dan Carpenter wrote: > nouveau_load() just returned directly if there was an error instead of > releasing resources. > > Signed-off-by: Dan Carpenter Patch looks good, but could you base it on top of nouveau tree? git://anongit.freedesktop.org/nouveau/linux-2.6 Marcin
[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.
https://bugs.freedesktop.org/show_bug.cgi?id=29311 Scott Moreau changed: What|Removed |Added QAContact||brianp at vmware.com CC||oreaus at gmail.com -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[patch] nouveau: unwind on load errors
nouveau_load() just returned directly if there was an error instead of
releasing resources.
Signed-off-by: Dan Carpenter
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index e632339..e53253a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -688,10 +688,13 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
struct drm_nouveau_private *dev_priv;
uint32_t reg0;
resource_size_t mmio_start_offs;
+ int ret;
dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
- if (!dev_priv)
- return -ENOMEM;
+ if (!dev_priv) {
+ ret = -ENOMEM;
+ goto err_out;
+ }
dev->dev_private = dev_priv;
dev_priv->dev = dev;
@@ -702,8 +705,10 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
dev->pci_vendor, dev->pci_device, dev->pdev->class);
dev_priv->wq = create_workqueue("nouveau");
- if (!dev_priv->wq)
- return -EINVAL;
+ if (!dev_priv->wq) {
+ ret = -EINVAL;
+ goto err_priv;
+ }
/* resource 0 is mmio regs */
/* resource 1 is linear FB */
@@ -716,7 +721,8 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
if (!dev_priv->mmio) {
NV_ERROR(dev, "Unable to initialize the mmio mapping. "
"Please report your setup to " DRIVER_EMAIL "\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_wq;
}
NV_DEBUG(dev, "regs mapped ok at 0x%llx\n",
(unsigned long long)mmio_start_offs);
@@ -764,16 +770,17 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
break;
default:
NV_INFO(dev, "Unsupported chipset 0x%08x\n", reg0);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_mmio;
}
NV_INFO(dev, "Detected an NV%2x generation card (0x%08x)\n",
dev_priv->card_type, reg0);
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- int ret = nouveau_remove_conflicting_drivers(dev);
+ ret = nouveau_remove_conflicting_drivers(dev);
if (ret)
- return ret;
+ goto err_mmio;
}
/* map larger RAMIN aperture on NV40 cards */
@@ -801,7 +808,8 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
dev_priv->ramin_size);
if (!dev_priv->ramin) {
NV_ERROR(dev, "Failed to map BAR0 PRAMIN.\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_mmio;
}
}
@@ -815,12 +823,24 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
/* For kernel modesetting, init card now and bring up fbcon */
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- int ret = nouveau_card_init(dev);
+ ret = nouveau_card_init(dev);
if (ret)
- return ret;
+ goto err_ramin;
}
return 0;
+
+err_ramin:
+ iounmap(dev_priv->ramin);
+err_mmio:
+ iounmap(dev_priv->mmio);
+err_wq:
+ destroy_workqueue(dev_priv->wq);
+err_priv:
+ kfree(dev_priv);
+ dev->dev_private = NULL;
+err_out:
+ return ret;
}
static void nouveau_close(struct drm_device *dev)
[Bug 29311] New: [r300g]: Compiz crashes when trying to start it with latest mesa master.
https://bugs.freedesktop.org/show_bug.cgi?id=29311 Summary: [r300g]: Compiz crashes when trying to start it with latest mesa master. Product: DRI Version: unspecified Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: DRM/Radeon AssignedTo: dri-devel at lists.freedesktop.org ReportedBy: oreaus at gmail.com Created an attachment (id=37448) --> (https://bugs.freedesktop.org/attachment.cgi?id=37448) compiz crash backtrace I bisected and got this: ba2cc3b8e6ad161181b67fd2575c6bc768584d23 is the first bad commit commit ba2cc3b8e6ad161181b67fd2575c6bc768584d23 Author: Brian Paul Date: Thu Jul 29 13:49:21 2010 -0600 gallium: implement bounds checking for constant buffers Plumb the constant buffer sizes down into the tgsi interpreter where we can do bounds checking. Optional debug code warns upon out-of-bounds reading. Plus add a few other assertions in the TGSI interpreter. :04 04 7141c078038120e29bab2e275fb935f20731c0ff e2f4d072421db8d000922127dc1f707145b73c61 Msrc -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 28955] [r300g]: refresh/update/damage issues using compiz.
https://bugs.freedesktop.org/show_bug.cgi?id=28955 --- Comment #2 from Kristian H?gsberg 2010-07-29 15:38:34 PDT --- Dup of 28438? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 okias changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from okias 2010-07-29 14:26:28 PDT --- fixed, thanks -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29303] New: [r300g] compiz segfaults when resizing windows
https://bugs.freedesktop.org/show_bug.cgi?id=29303 Summary: [r300g] compiz segfaults when resizing windows Product: Mesa Version: git Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Drivers/DRI/r300 AssignedTo: dri-devel at lists.freedesktop.org ReportedBy: ghepeu at virgilio.it Created an attachment (id=37444) --> (https://bugs.freedesktop.org/attachment.cgi?id=37444) Backtrace of the crash As per the summary, compiz segfaults with r300g when resizing windows. I'm using mesa from current git (head cd601513f5ff4f488a6f6527bb033e39ee62ffda) but the bug has been there for at least a couple of months. My card is a Radeon X550 RV370 5B63 PCIE, kernel 2.6.34.1, xf86-video-ati from git, xserver 1.8.2, compiz 0.8.4 (+gtk-window-decorator), gnome 2.30. Full backtrace of the crash attached. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #6 from Marek Ol??k 2010-07-29 13:26:24 PDT --- The new issue is not an r300g bug. There is a new GLX fix committed 21 minutes ago from Kristian. Could you please retest and if it doesn't help, file a new bug against GLX or Mesa core and copy the backtrace there? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297
--- Comment #5 from okias 2010-07-29 12:21:55 PDT ---
problem disappered, but appeared another:
INFO: Creating input thread
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7fffce9fa710 (LWP 11627)]
__glXInitialize (dpy=0x7fffd9a28000) at glxext.c:802
802 glxext.c: No such file or directory.
in glxext.c
(gdb) bt full
#0 __glXInitialize (dpy=0x7fffd9a28000) at glxext.c:802
dpyPriv = 0x40
glx_direct =
i =
#1 0x7fffd80e8f29 in glXQueryVersion (dpy=0x7fffd9a28000,
major=0x7fffce9f9e6c, minor=0x7fffce9f9e68) at glxcmds.c:443
priv = 0x7fffce9f9e68
#2 0x7fffd8eb25e7 in lightspark::RenderThread::gtkplug_worker
(th=0x7fffcd4bec00) at
/var/tmp/portage/www-plugins/lightspark-/work/lightspark-/swf.cpp:1356
a =
fb = 0x0
i =
profile = 0x0
size = {Xmin = 0, Xmax = 9600, Ymin = 0, Ymax = 7740}
window_height = 385
b = 98500
glxWin = 0
glx_present =
attrib = {0, 0, 0, 0, 0, 0, -138635232, 32767, 0, 1073741824}
p = 0x7fffcd217638
window_width = 640
d =
font =
#3 0x77bc98e4 in start_thread () from /lib/libpthread.so.0
No symbol table info available.
#4 0x76f8e27d in clone () from /lib/libc.so.6
No symbol table info available.
--
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #4 from Marek Ol??k 2010-07-29 12:02:29 PDT --- I've committed some fixes, could you retest with current mesa git? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 okias changed: What|Removed |Added Component|Drivers/DRI/r200|Drivers/DRI/r300 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 24818] shadowtex demo doesn't work on rs780
https://bugs.freedesktop.org/show_bug.cgi?id=24818 --- Comment #8 from T?r?k Edwin 2010-07-29 09:49:40 PDT --- (In reply to comment #7) > (In reply to comment #4) > > I can confirm this using mesa master and RV620. > > > > I've noticed that corruption is random as I restart shadowtex demo until > > some > > time. After starting it for example 10th time, corruption stops changing. > > So it > > indeed looks like using some random data from VRAM or something. After > > having > > "stable" corruption I've to reboot to get random corruptions again (for a > > few > > shadowtex restarts). > > Seems like there's been a further regression - probably in mesa master during > the last few weeks. I now can't run this at all - > > shadowtex: r700_assembler.c:6355: Process_Export: Assertion > `starting_register_number >= pAsm->starting_export_register_number' failed. > > Anyone else getting this? The assert just got fixed by 9b3bf392e1af72d29afa0804260cac4d8ffe24e1. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 okias changed: What|Removed |Added Attachment #37438|0 |1 is obsolete|| --- Comment #3 from okias 2010-07-29 09:49:24 PDT --- Created an attachment (id=37440) --> (https://bugs.freedesktop.org/attachment.cgi?id=37440) gdb_output2.txt Previous was debug symbols in separate file, so it was someway unable to load it. Now it's compiled directly into libs. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29263] shadowtex: r700_assembler.c:6355: Process_Export: Assertion `starting_register_number >= pAsm->starting_export_register_number' failed.
https://bugs.freedesktop.org/show_bug.cgi?id=29263 T?r?k Edwin changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #3 from T?r?k Edwin 2010-07-29 09:15:55 PDT --- (In reply to comment #2) > The commit from bisect does not look like the real cause. > Should be fixed by 9b3bf392e1af72d29afa0804260cac4d8ffe24e1 > > Andre Thanks, that fixed the assert. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver
https://bugs.freedesktop.org/show_bug.cgi?id=27901 --- Comment #23 from Alain Perrot 2010-07-29 09:12:45 PDT --- I have just tested your patch with my RV670 GPU, and the hello-gl-ch3 example program works fine here. The piglit glean/glsl1-cos(vec4) and glean/glsl1-sin(vec4) tests are also fixed with this patch. Thanks! -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #2 from Marek Ol??k 2010-07-29 09:09:22 PDT --- Could you please compile r300g with --enable-debug? This should give us a more useful backtrace. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #1 from okias 2010-07-29 08:04:47 PDT --- Created an attachment (id=37439) --> (https://bugs.freedesktop.org/attachment.cgi?id=37439) dmesg_rs690.txt HW: Radeon X1250, RS690. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29297] New: [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 Summary: [r300g] lightspark crash Product: Mesa Version: git Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/DRI/r200 AssignedTo: dri-devel at lists.freedesktop.org ReportedBy: d.okias at gmail.com Created an attachment (id=37438) --> (https://bugs.freedesktop.org/attachment.cgi?id=37438) gdb_output.txt Lightspark use for everything OpenGL rendering, so it crash almost every time. I will attach firefox gdb. Mesa with debug, lightspark with debug. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver
https://bugs.freedesktop.org/show_bug.cgi?id=27901 --- Comment #22 from Andre Maasikas 2010-07-29 07:58:26 PDT --- Created an attachment (id=37437) View: https://bugs.freedesktop.org/attachment.cgi?id=37437 Review: https://bugs.freedesktop.org/review?bug=27901=37437 patch to try If you could try the attached patch on r600, it passes fine for me on r700. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 28955] [r300g]: refresh/update/damage issues using compiz.
https://bugs.freedesktop.org/show_bug.cgi?id=28955 --- Comment #1 from Alex Deucher 2010-07-29 07:15:55 PDT --- Does 'make clean' help? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 29263] shadowtex: r700_assembler.c:6355: Process_Export: Assertion `starting_register_number >= pAsm->starting_export_register_number' failed.
https://bugs.freedesktop.org/show_bug.cgi?id=29263 Andre Maasikas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Andre Maasikas 2010-07-29 05:26:02 PDT --- The commit from bisect does not look like the real cause. Should be fixed by 9b3bf392e1af72d29afa0804260cac4d8ffe24e1 Andre -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 28474] [r300g] lugaru/etc locks up laptop
https://bugs.freedesktop.org/show_bug.cgi?id=28474 --- Comment #10 from Niels Ole Salscheider 2010-07-29 00:24:37 PDT --- Created an attachment (id=37427) --> (https://bugs.freedesktop.org/attachment.cgi?id=37427) Bisect log -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 28474] [r300g] lugaru/etc locks up laptop
https://bugs.freedesktop.org/show_bug.cgi?id=28474 --- Comment #9 from Niels Ole Salscheider 2010-07-29 00:23:19 PDT --- I am not sure if this is the same bug but I experience lockups with r300g in games (extreme tux racer, speed dreams) a few seconds after the start since I upgraded to 2.6.35. I tried to bisect the kernel and I found that 61cf059325a30995a78c5001db2ed2a8ab1d4c36 is good while 5876dd249e8e47c730cac090bf6edd88e5f04327 is bad. When I try to continue bisecting my OpenGL applications do not display anything. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
[Bug 28474] [r300g] lugaru/etc locks up laptop
https://bugs.freedesktop.org/show_bug.cgi?id=28474 --- Comment #9 from Niels Ole Salscheider niels_...@salscheider-online.de 2010-07-29 00:23:19 PDT --- I am not sure if this is the same bug but I experience lockups with r300g in games (extreme tux racer, speed dreams) a few seconds after the start since I upgraded to 2.6.35. I tried to bisect the kernel and I found that 61cf059325a30995a78c5001db2ed2a8ab1d4c36 is good while 5876dd249e8e47c730cac090bf6edd88e5f04327 is bad. When I try to continue bisecting my OpenGL applications do not display anything. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 28474] [r300g] lugaru/etc locks up laptop
https://bugs.freedesktop.org/show_bug.cgi?id=28474 --- Comment #10 from Niels Ole Salscheider niels_...@salscheider-online.de 2010-07-29 00:24:37 PDT --- Created an attachment (id=37427) -- (https://bugs.freedesktop.org/attachment.cgi?id=37427) Bisect log -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 28955] [r300g]: refresh/update/damage issues using compiz.
https://bugs.freedesktop.org/show_bug.cgi?id=28955 --- Comment #1 from Alex Deucher ag...@yahoo.com 2010-07-29 07:15:55 PDT --- Does 'make clean' help? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #1 from okias d.ok...@gmail.com 2010-07-29 08:04:47 PDT --- Created an attachment (id=37439) -- (https://bugs.freedesktop.org/attachment.cgi?id=37439) dmesg_rs690.txt HW: Radeon X1250, RS690. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29263] shadowtex: r700_assembler.c:6355: Process_Export: Assertion `starting_register_number = pAsm-starting_export_register_number' failed.
https://bugs.freedesktop.org/show_bug.cgi?id=29263 Török Edwin edwinto...@gmail.com changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #3 from Török Edwin edwinto...@gmail.com 2010-07-29 09:15:55 PDT --- (In reply to comment #2) The commit from bisect does not look like the real cause. Should be fixed by 9b3bf392e1af72d29afa0804260cac4d8ffe24e1 Andre Thanks, that fixed the assert. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 okias d.ok...@gmail.com changed: What|Removed |Added Attachment #37438|0 |1 is obsolete|| --- Comment #3 from okias d.ok...@gmail.com 2010-07-29 09:49:24 PDT --- Created an attachment (id=37440) -- (https://bugs.freedesktop.org/attachment.cgi?id=37440) gdb_output2.txt Previous was debug symbols in separate file, so it was someway unable to load it. Now it's compiled directly into libs. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 24818] shadowtex demo doesn't work on rs780
https://bugs.freedesktop.org/show_bug.cgi?id=24818 --- Comment #8 from Török Edwin edwinto...@gmail.com 2010-07-29 09:49:40 PDT --- (In reply to comment #7) (In reply to comment #4) I can confirm this using mesa master and RV620. I've noticed that corruption is random as I restart shadowtex demo until some time. After starting it for example 10th time, corruption stops changing. So it indeed looks like using some random data from VRAM or something. After having stable corruption I've to reboot to get random corruptions again (for a few shadowtex restarts). Seems like there's been a further regression - probably in mesa master during the last few weeks. I now can't run this at all - shadowtex: r700_assembler.c:6355: Process_Export: Assertion `starting_register_number = pAsm-starting_export_register_number' failed. Anyone else getting this? The assert just got fixed by 9b3bf392e1af72d29afa0804260cac4d8ffe24e1. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 okias d.ok...@gmail.com changed: What|Removed |Added Component|Drivers/DRI/r200|Drivers/DRI/r300 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[patch] nouveau: unwind on load errors
nouveau_load() just returned directly if there was an error instead of
releasing resources.
Signed-off-by: Dan Carpenter erro...@gmail.com
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index e632339..e53253a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -688,10 +688,13 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
struct drm_nouveau_private *dev_priv;
uint32_t reg0;
resource_size_t mmio_start_offs;
+ int ret;
dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
- if (!dev_priv)
- return -ENOMEM;
+ if (!dev_priv) {
+ ret = -ENOMEM;
+ goto err_out;
+ }
dev-dev_private = dev_priv;
dev_priv-dev = dev;
@@ -702,8 +705,10 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
dev-pci_vendor, dev-pci_device, dev-pdev-class);
dev_priv-wq = create_workqueue(nouveau);
- if (!dev_priv-wq)
- return -EINVAL;
+ if (!dev_priv-wq) {
+ ret = -EINVAL;
+ goto err_priv;
+ }
/* resource 0 is mmio regs */
/* resource 1 is linear FB */
@@ -716,7 +721,8 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
if (!dev_priv-mmio) {
NV_ERROR(dev, Unable to initialize the mmio mapping.
Please report your setup to DRIVER_EMAIL \n);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_wq;
}
NV_DEBUG(dev, regs mapped ok at 0x%llx\n,
(unsigned long long)mmio_start_offs);
@@ -764,16 +770,17 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
break;
default:
NV_INFO(dev, Unsupported chipset 0x%08x\n, reg0);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_mmio;
}
NV_INFO(dev, Detected an NV%2x generation card (0x%08x)\n,
dev_priv-card_type, reg0);
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- int ret = nouveau_remove_conflicting_drivers(dev);
+ ret = nouveau_remove_conflicting_drivers(dev);
if (ret)
- return ret;
+ goto err_mmio;
}
/* map larger RAMIN aperture on NV40 cards */
@@ -801,7 +808,8 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
dev_priv-ramin_size);
if (!dev_priv-ramin) {
NV_ERROR(dev, Failed to map BAR0 PRAMIN.\n);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_mmio;
}
}
@@ -815,12 +823,24 @@ int nouveau_load(struct drm_device *dev, unsigned long
flags)
/* For kernel modesetting, init card now and bring up fbcon */
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- int ret = nouveau_card_init(dev);
+ ret = nouveau_card_init(dev);
if (ret)
- return ret;
+ goto err_ramin;
}
return 0;
+
+err_ramin:
+ iounmap(dev_priv-ramin);
+err_mmio:
+ iounmap(dev_priv-mmio);
+err_wq:
+ destroy_workqueue(dev_priv-wq);
+err_priv:
+ kfree(dev_priv);
+ dev-dev_private = NULL;
+err_out:
+ return ret;
}
static void nouveau_close(struct drm_device *dev)
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297 --- Comment #4 from Marek Olšák mar...@gmail.com 2010-07-29 12:02:29 PDT --- I've committed some fixes, could you retest with current mesa git? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29297] [r300g] lightspark crash
https://bugs.freedesktop.org/show_bug.cgi?id=29297
--- Comment #5 from okias d.ok...@gmail.com 2010-07-29 12:21:55 PDT ---
problem disappered, but appeared another:
INFO: Creating input thread
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7fffce9fa710 (LWP 11627)]
__glXInitialize (dpy=0x7fffd9a28000) at glxext.c:802
802 glxext.c: No such file or directory.
in glxext.c
(gdb) bt full
#0 __glXInitialize (dpy=0x7fffd9a28000) at glxext.c:802
dpyPriv = 0x40
glx_direct = value optimized out
i = value optimized out
#1 0x7fffd80e8f29 in glXQueryVersion (dpy=0x7fffd9a28000,
major=0x7fffce9f9e6c, minor=0x7fffce9f9e68) at glxcmds.c:443
priv = 0x7fffce9f9e68
#2 0x7fffd8eb25e7 in lightspark::RenderThread::gtkplug_worker
(th=0x7fffcd4bec00) at
/var/tmp/portage/www-plugins/lightspark-/work/lightspark-/swf.cpp:1356
a = value optimized out
fb = 0x0
i = value optimized out
profile = 0x0
size = {Xmin = 0, Xmax = 9600, Ymin = 0, Ymax = 7740}
window_height = 385
b = 98500
glxWin = 0
glx_present = value optimized out
attrib = {0, 0, 0, 0, 0, 0, -138635232, 32767, 0, 1073741824}
p = 0x7fffcd217638
window_width = 640
d = value optimized out
font = incomplete type
#3 0x77bc98e4 in start_thread () from /lib/libpthread.so.0
No symbol table info available.
#4 0x76f8e27d in clone () from /lib/libc.so.6
No symbol table info available.
--
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
[git pull] drm fixes
Just two, one edid, the other a radeon pm info reporting fix. The following changes since commit fc0f5ac8fe693d1b05f5a928cc48135d1c8b7f2e: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (2010-07-27 14:32:59 -0700) are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes Adam Jackson (1): drm/edid: Fix the HDTV hack sync adjustment Daniel J Blueman (1): drm/radeon/kms: fix radeon mid power profile reporting drivers/gpu/drm/drm_edid.c |4 ++-- drivers/gpu/drm/radeon/radeon_pm.c |1 + 2 files changed, 3 insertions(+), 2 deletions(-) ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[Bug 29311] New: [r300g]: Compiz crashes when trying to start it with latest mesa master.
https://bugs.freedesktop.org/show_bug.cgi?id=29311 Summary: [r300g]: Compiz crashes when trying to start it with latest mesa master. Product: DRI Version: unspecified Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: DRM/Radeon AssignedTo: dri-devel@lists.freedesktop.org ReportedBy: ore...@gmail.com Created an attachment (id=37448) -- (https://bugs.freedesktop.org/attachment.cgi?id=37448) compiz crash backtrace I bisected and got this: ba2cc3b8e6ad161181b67fd2575c6bc768584d23 is the first bad commit commit ba2cc3b8e6ad161181b67fd2575c6bc768584d23 Author: Brian Paul bri...@vmware.com Date: Thu Jul 29 13:49:21 2010 -0600 gallium: implement bounds checking for constant buffers Plumb the constant buffer sizes down into the tgsi interpreter where we can do bounds checking. Optional debug code warns upon out-of-bounds reading. Plus add a few other assertions in the TGSI interpreter. :04 04 7141c078038120e29bab2e275fb935f20731c0ff e2f4d072421db8d000922127dc1f707145b73c61 Msrc -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
