[r300] Results on Radeon 9600 M10 Mobile laptop (T42)
Finally built it with Xorg-HEAD, Mesa-HEAD, some GL screensavers such as the ones that come with KDE and had some very very good results (no flicker). Since I've got this going finally, is there any debugging information you want to know? I'd certainly like to help debug/test the driver as it's showing good promice so far. Bzflag doesn't run (segfaults). :01:00.0 VGA compatible controller: ATI Technologies Inc RV350 [Mobility Radeon 9600 M10] $ glxgears Using 8 maximum texture units.. sizeof(drm_r300_cmd_header_t)=4 sizeof(drm_radeon_cmd_buffer_t)=16 Allocating 284420 bytes command buffer (max state is 11140 bytes) *WARN_ONCE* File r300_state.c function r300Enable line 494 TODO - double side stencil ! *** *WARN_ONCE* File r300_state.c function r300Enable line 515 Don't know how to enable polygon offset point/line. Help me ! *** *WARN_ONCE* File r300_render.c function r300_get_num_verts line 185 user error: Need more than 2 vertices to draw primitive QS ! *** 6245 frames in 5.0 seconds = 1248.870 FPS 5871 frames in 5.0 seconds = 1174.085 FPS 6466 frames in 5.0 seconds = 1293.182 FPS 6207 frames in 5.0 seconds = 1241.370 FPS Thanks, Shawn. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
On Thu, 24 Mar 2005 14:21:31 -0800 Andrew Morton <[EMAIL PROTECTED]> wrote: > cliff white <[EMAIL PROTECTED]> wrote: > > > > Okay, i have a iBook G4, with radeon, with 2.6.12-rc1-mm2, i'm getting the > > following OOPS > > on boot. > > Please try reverting agp-make-some-code-static.patch (Dunno why that would > fix an oops, but apparently it does). > It does the same thing Brice's fix does. Need to put the one extern struct definition back in agp_backend.h and that is the badness: diff -puN include/linux/agp_backend.h~agp-make-some-code-static include/linux/agp_backend.h --- 25/include/linux/agp_backend.h~agp-make-some-code-static2005-03-21 21:53:17.0 -0800 +++ 25-akpm/include/linux/agp_backend.h 2005-03-21 21:53:17.0 -0800 @@ -94,8 +94,6 @@ struct agp_memory { extern struct agp_bridge_data *agp_bridge; extern struct list_head agp_bridges; -extern struct agp_bridge_data *(*agp_find_bridge)(struct pci_dev *); - extern void agp_free_memory(struct agp_memory *); extern struct agp_memory *agp_allocate_memory(struct agp_bridge_data *, size_t, u32); extern int agp_copy_info(struct agp_bridge_data *, struct agp_kern_info *); _ -- cliffw -- "Ive always gone through periods where I bolt upright at four in the morning; now at least theres a reason." -Michael Feldman --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 44] Radeon Driver hard locks during VT switches/resolution changes 8500DV DRI only
Please do not reply to this email: if you want to comment on the bug, go to the URL shown below and enter your comments there. http://bugs.xfree86.org/show_bug.cgi?id=44 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] -- Configure bugmail: http://bugs.xfree86.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
cliff white <[EMAIL PROTECTED]> wrote: > > -extern struct agp_bridge_data *(*agp_find_bridge)(struct pci_dev *); > - Oh crap, so the compiler decided that agp_find_bridge() was a function and decided to jump to it, rather than reading from it and doing an indirect jump. Yup, that'll crash it. Sorry about that. This is another reason why doing the old-style (*agp_find_bridge)(...); is better than doing the new-style agp_find_bridge(...); The former case won't even compile, and is more readable. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
cliff white <[EMAIL PROTECTED]> wrote: > > Okay, i have a iBook G4, with radeon, with 2.6.12-rc1-mm2, i'm getting the > following OOPS > on boot. Please try reverting agp-make-some-code-static.patch (Dunno why that would fix an oops, but apparently it does). --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
On Thu, 24 Mar 2005 10:33:02 + (GMT) Dave Airlie <[EMAIL PROTECTED]> wrote: > > Hi Andrew, Dave, > > I've put a couple of patches into my drm-2.6 tree that hopefully fix up > the multi-bridge on i915 and the XFree86 4.3 issue.. Andrew can you drop > the two patches in your tree.. the one from Brice and the one I attached > to the bug? you'll get conflicts anyway I'm sure. I had to modify Brices > one as it didn't look safe to me in all cases.. > > I think their might be one left, but I think it only seems to be on > non-intel AGP system, as in my system works fine for a combination of > cards and X releases ... anyone with a VIA chipset and Radeon graphics > card or r128 card.. testing the next -mm would help me a lot.. Okay, i have a iBook G4, with radeon, with 2.6.12-rc1-mm2, i'm getting the following OOPS on boot. I'm hand-copying this stuff, please let me know if you need any more info, .config, etc [drm] Initalized drm 1.0.0 20040925 floating point used in kernel (task=effc1770, pc=c03bd040) Oops: kernel access of nad area, sig:11 [#1] PREEMPT NIP: C03BD040 LR: C01, cliffw80540 SP: ... TASK = effc1770[1] 'swapper' THREAD: effc2000 LRL [c0180540] drm_agp_init+0x48/0xdc Call trace: [c017e74c] drm_fill_in_dev+0xdc/0x180 [c017eb44] drm_get_dev+0x78 [c...] radeon_init [c...] do_initcalls [c..] init [c..] kernel_thread --- cliffw > > Dave. > > -- > David Airlie, Software Engineer > http://www.skynet.ie/~airlied / airlied at skynet.ie > Linux kernel - DRI, VAX / pam_smb / ILUG > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- "Ive always gone through periods where I bolt upright at four in the morning; now at least theres a reason." -Michael Feldman --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 2797] New: DRI with r300 doesn't work with Crystal Space
Please do not reply to this email: if you want to comment on the bug, go to the URL shown below and enter yourcomments there. https://bugs.freedesktop.org/show_bug.cgi?id=2797 Summary: DRI with r300 doesn't work with Crystal Space Product: DRI Version: XOrg CVS Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: libGL AssignedTo: dri-devel@lists.sourceforge.net ReportedBy: [EMAIL PROTECTED] DRI works great with some programs but not with others. Here's the log from running tuxracer. [EMAIL PROTECTED]:/opt/Xorg-6.8$ LIBGL_DEBUG=verbose tuxracer Tux Racer 0.61 -- a Sunspire Studios Production (http://www.sunspirestudios.com) (c) 1999-2000 Jasmin F. Patry <[EMAIL PROTECTED]> "Tux Racer" is a trademark of Jasmin F. Patry Tux Racer comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. See http://www.gnu.org/copyleft/gpl.html for details. libGL: XF86DRIGetClientDriverName: 4.0.1 r300 (screen 0) libGL: OpenDriver: trying /opt/Xorg-6.8/lib/modules/dri/r300_dri.so drmOpenByBusid: Searching for BusID pci::01:00.0 drmOpenDevice: node name is /dev/dri/card0 drmOpenDevice: open result is 7, (OK) drmOpenByBusid: drmOpenMinor returns 7 drmOpenByBusid: drmGetBusid reports pci::01:00.0 libGL error: Can't open configuration file /etc/drirc: No such file or directory. The log continues on from there.. it works great, in other words, and I can play hardware-accelerated tuxracer. Here's what happens if I try to run Crystal Space: [EMAIL PROTECTED]:~/software/CS$ LIBGL_DEBUG=verbose ./walktest NOTIFY: Could not get sound driver libGL: XF86DRIGetClientDriverName: 4.0.1 r300 (screen 0) libGL: OpenDriver: trying /opt/Xorg-6.8/lib/modules/dri/r300_dri.so libGL error: dlopen /opt/Xorg-6.8/lib/modules/dri/r300_dri.so failed (/opt/Xorg-6.8/lib/modules/dri/r300_dri.so: undefined symbol: glXGetProcAddress) libGL error: unable to find driver: r300_dri.so Indirect rendering may indicate a flawed OpenGL setup if you run on a local X server. At first I thought this was an error from compiling against the wrong headers or libraries, but recompiling doesn't make it go away. My next thought was that this happened because walktest wasn't directly linked with libGL, but rather uses some kind of dlopen magic to talk to a plugin that is linked against libGL. So I linked walktest manually against libGL, which made this error went away but then it wouldn't render anything, only draw a totally back window. The CS people suggest this might be due to the experimentalness of the r300 driver. Any ideas? Ethan -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 4337] ATI Rage 128: messed up X
http://bugme.osdl.org/show_bug.cgi?id=4337 --- Additional Comments From [EMAIL PROTECTED] 2005-03-24 10:39 --- Oops, might be one of the other tlb related changes as well. See the changesets for via-agp.c at http://linux.bkbits.net:8080/linux-2.5/src/drivers/char/agp?nav=index.html| src/.|src/drivers|src/drivers/char and try reverting some of the others that affect the tlbflush routine. --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 4337] ATI Rage 128: messed up X
http://bugme.osdl.org/show_bug.cgi?id=4337 --- Additional Comments From [EMAIL PROTECTED] 2005-03-24 10:36 --- How about reverting this bit from via-agp.c? Dave said that some other via users' problems were fixed that way. --- a/drivers/char/agp/via-agp.c2005-03-24 10:33:45 -08:00 +++ b/drivers/char/agp/via-agp.c2005-03-24 10:33:45 -08:00 @@ -83,8 +83,10 @@ pci_read_config_dword(agp_bridge->dev, VIA_GARTCTRL, &temp); temp |= (1<<7); + temp &= ~0x7f; pci_write_config_dword(agp_bridge->dev, VIA_GARTCTRL, temp); temp &= ~(1<<7); + temp &= ~0x7f; pci_write_config_dword(agp_bridge->dev, VIA_GARTCTRL, temp); } --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
On Thursday, March 24, 2005 10:18 am, Dave Jones wrote: > > I'm trying to get ahold of one--so hopefully I'll be able to test and > > fix this stuff up when I do. > > Aparently backing out the changes to via's tlb_flush routine fixed it > for one VIA user. I've not had a chance to look into it just yet. > Worse case we can just drop those changes for 2.6.12 You mean these changes? --- a/drivers/char/agp/via-agp.c2005-03-24 10:33:45 -08:00 +++ b/drivers/char/agp/via-agp.c2005-03-24 10:33:45 -08:00 @@ -83,8 +83,10 @@ pci_read_config_dword(agp_bridge->dev, VIA_GARTCTRL, &temp); temp |= (1<<7); + temp &= ~0x7f; pci_write_config_dword(agp_bridge->dev, VIA_GARTCTRL, temp); temp &= ~(1<<7); + temp &= ~0x7f; pci_write_config_dword(agp_bridge->dev, VIA_GARTCTRL, temp); } I'll ask Markus to try reverting this since I still don't have a machine setup. It sounds like a possibility given what he's seeing. Jesse --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 4389] kernel source 2.6.11.5 misses drivers/char/drm/gamma.h
http://bugme.osdl.org/show_bug.cgi?id=4389 [EMAIL PROTECTED] changed: What|Removed |Added Owner|[EMAIL PROTECTED] |[EMAIL PROTECTED] |bugs.osdl.org | Status|NEW |ASSIGNED --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
On Thu, Mar 24, 2005 at 09:02:03AM -0800, Jesse Barnes wrote: > On Thursday, March 24, 2005 2:33 am, Dave Airlie wrote: > > Hi Andrew, Dave, > > > > I've put a couple of patches into my drm-2.6 tree that hopefully fix up > > the multi-bridge on i915 and the XFree86 4.3 issue.. Andrew can you drop > > the two patches in your tree.. the one from Brice and the one I attached > > to the bug? you'll get conflicts anyway I'm sure. I had to modify Brices > > one as it didn't look safe to me in all cases.. > > > > I think their might be one left, but I think it only seems to be on > > non-intel AGP system, as in my system works fine for a combination of > > cards and X releases ... anyone with a VIA chipset and Radeon graphics > > card or r128 card.. testing the next -mm would help me a lot.. > > I'm trying to get ahold of one--so hopefully I'll be able to test and fix > this > stuff up when I do. Aparently backing out the changes to via's tlb_flush routine fixed it for one VIA user. I've not had a chance to look into it just yet. Worse case we can just drop those changes for 2.6.12 Dave --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
On Thursday, March 24, 2005 2:33 am, Dave Airlie wrote: > Hi Andrew, Dave, > > I've put a couple of patches into my drm-2.6 tree that hopefully fix up > the multi-bridge on i915 and the XFree86 4.3 issue.. Andrew can you drop > the two patches in your tree.. the one from Brice and the one I attached > to the bug? you'll get conflicts anyway I'm sure. I had to modify Brices > one as it didn't look safe to me in all cases.. > > I think their might be one left, but I think it only seems to be on > non-intel AGP system, as in my system works fine for a combination of > cards and X releases ... anyone with a VIA chipset and Radeon graphics > card or r128 card.. testing the next -mm would help me a lot.. I'm trying to get ahold of one--so hopefully I'll be able to test and fix this stuff up when I do. Jesse --- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[Bug 4337] ATI Rage 128: messed up X
http://bugme.osdl.org/show_bug.cgi?id=4337 --- Additional Comments From [EMAIL PROTECTED] 2005-03-24 05:51 --- "fix a bug in setversion ioctl with XFree86 4.3" does not fix the bug I have (applied on 2.6.12-rc1) --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005 Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows Embedded(r) & Windows Mobile(tm) platforms, applications & content. Register by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: drm bugs hopefully fixed but there might still be one..
Dave Airlie <[EMAIL PROTECTED]> wrote: > > I've put a couple of patches into my drm-2.6 tree that hopefully fix up > the multi-bridge on i915 and the XFree86 4.3 issue.. Andrew can you drop > the two patches in your tree.. the one from Brice and the one I attached > to the bug? you'll get conflicts anyway I'm sure. I had to modify Brices > one as it didn't look safe to me in all cases.. > > I think their might be one left, but I think it only seems to be on > non-intel AGP system, as in my system works fine for a combination of > cards and X releases ... anyone with a VIA chipset and Radeon graphics > card or r128 card.. testing the next -mm would help me a lot.. argh, I just uploaded -mm2, but haven't announced it yet. I'll resync with your -bk. --- This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005 Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows Embedded(r) & Windows Mobile(tm) platforms, applications & content. Register by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
drm bugs hopefully fixed but there might still be one..
Hi Andrew, Dave, I've put a couple of patches into my drm-2.6 tree that hopefully fix up the multi-bridge on i915 and the XFree86 4.3 issue.. Andrew can you drop the two patches in your tree.. the one from Brice and the one I attached to the bug? you'll get conflicts anyway I'm sure. I had to modify Brices one as it didn't look safe to me in all cases.. I think their might be one left, but I think it only seems to be on non-intel AGP system, as in my system works fine for a combination of cards and X releases ... anyone with a VIA chipset and Radeon graphics card or r128 card.. testing the next -mm would help me a lot.. Dave. -- David Airlie, Software Engineer http://www.skynet.ie/~airlied / airlied at skynet.ie Linux kernel - DRI, VAX / pam_smb / ILUG --- This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005 Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows Embedded(r) & Windows Mobile(tm) platforms, applications & content. Register by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
drivers/char/drm/ severely broken - with this it at least builds
Parts of drivers/char/drm/ is severely broken in 2.6.12-rc1-mm1 - this is fair enough since it /is/ marked as broken. So, why am I writing this mail? Well, I /tried/ to build some of the stuff in there, saw it blow up, then tried to fix it, then gave up trying to fix it, got it into a state where it's still completely broken and will blow up pretty bad if you try to use it, but at least it now builds. I have absolutely no idea if any of the changes I made will be useful to anyone, but I thought I'd at least submit a patch with the changes I made, and if bits of it are useful, then good, if not - ohh well.. See further below for some of the warnings and errors I initially got that prompted my to try and fix it. Here's a patch with the changes I made - very ugly, very broken, possibly worse than it was, but perhaps there are some bits that are useful - you never know. : diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drmP.h linux-2.6.12-rc1-mm1/drivers/char/drm/drmP.h --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drmP.h 2005-03-21 23:15:34.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/drmP.h2005-03-24 00:17:38.0 +0100 @@ -423,6 +423,7 @@ typedef struct drm_file { struct drm_file *next; struct drm_file *prev; struct drm_head *head; + struct drm_device *dev; int remove_auth_on_close; unsigned long lock_count; void *driver_priv; @@ -737,6 +738,7 @@ typedef struct drm_device { structdrm_driver *driver; drm_local_map_t *agp_buffer_map; drm_head_t primary; /**< primary screen head */ + u32 driver_features; } drm_device_t; static __inline__ int drm_core_check_feature(struct drm_device *dev, int feature) diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drm_memory.h linux-2.6.12-rc1-mm1/drivers/char/drm/drm_memory.h --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drm_memory.h 2005-03-02 08:37:49.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/drm_memory.h 2005-03-24 00:03:53.0 +0100 @@ -33,6 +33,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef __DRM_MEMORY_H +#define __DRM_MEMORY_H + #include #include #include @@ -194,4 +197,4 @@ static inline void drm_ioremapfree(void iounmap(pt); } - +#endif /* __DRM_MEMORY_H */ diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drm_os_linux.h linux-2.6.12-rc1-mm1/drivers/char/drm/drm_os_linux.h --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/drm_os_linux.h 2005-03-21 23:12:26.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/drm_os_linux.h2005-03-24 00:18:57.0 +0100 @@ -89,7 +89,7 @@ static __inline__ int mtrr_del (int reg, copy_to_user(arg1, arg2, arg3) /* Macros for copyfrom user, but checking readability only once */ #define DRM_VERIFYAREA_READ( uaddr, size ) \ - verify_area( VERIFY_READ, uaddr, size ) + (access_ok( VERIFY_READ, uaddr, size ) ? 0 : -EFAULT) #define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3) \ __copy_from_user(arg1, arg2, arg3) #define DRM_COPY_TO_USER_UNCHECKED(arg1, arg2, arg3) \ diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma.h linux-2.6.12-rc1-mm1/drivers/char/drm/gamma.h --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma.h 1970-01-01 01:00:00.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/gamma.h 2005-03-23 23:35:20.0 +0100 @@ -0,0 +1,4 @@ +#ifndef __GAMMA_H__ +#define __GAMMA_H__ +#define DRM(x) gamma_##x +#endif diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma_context.h linux-2.6.12-rc1-mm1/drivers/char/drm/gamma_context.h --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma_context.h 2005-03-02 08:38:06.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/gamma_context.h 2005-03-24 00:01:26.0 +0100 @@ -190,12 +190,14 @@ int DRM(context_switch_complete)(drm_dev DRM_ERROR("Lock isn't held after context switch\n"); } +/* if (!dma || !(dma->next_buffer && dma->next_buffer->while_locked)) { if (DRM(lock_free)(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT)) { DRM_ERROR("Cannot free lock\n"); } } +*/ clear_bit(0, &dev->context_flag); wake_up_interruptible(&dev->context_wait); diff -uprN linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma_dma.c linux-2.6.12-rc1-mm1/drivers/char/drm/gamma_dma.c --- linux-2.6.12-rc1-mm1-orig/drivers/char/drm/gamma_dma.c 2005-03-02 08:38:26.0 +0100 +++ linux-2.6.12-rc1-mm1/drivers/char/drm/gamma_dma.c 2005-03-24 00:16:43.0 +0100 @@ -136,10 +136,10 @@ irqreturn_t gamma_driver_irq_handler( DR /* Free previous buffer */ if (test_and_set_bit(0, &dev->dma_flag))
[Bug 943] Patch to add support for 32bit DRI clients on 64bit machines
Please do not reply to this email: if you want to comment on the bug, go to the URL shown below and enter yourcomments there. https://bugs.freedesktop.org/show_bug.cgi?id=943 --- Additional Comments From [EMAIL PROTECTED] 2005-03-24 00:53 --- > I think the way to solve the problem is to always make a 32-bit handle for > _DRM_SHM memory when CONFIG_COMPAT is defined, so that the X server will get a > 32-bit handle for the SAREA even if it is a 64-bit process. That's exactly what my code is doing. I've got an updated version of my patch that handles backward compatibility much more gracefully. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005 Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows Embedded(r) & Windows Mobile(tm) platforms, applications & content. Register by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel