Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 21940 Details for
Bug 35467
xfree-4.3.99.901 patches for ia64
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
5105_ia64_4.2.99.901-ati-radeon-pagesize.patch (updated for 4.3.99.901)
5105_ia64_4.2.99.901-ati-radeon-pagesize.patch (text/plain), 4.10 KB, created by
Aron Griffis (RETIRED)
on 2003-12-09 12:29:24 UTC
(
hide
)
Description:
5105_ia64_4.2.99.901-ati-radeon-pagesize.patch (updated for 4.3.99.901)
Filename:
MIME Type:
Creator:
Aron Griffis (RETIRED)
Created:
2003-12-09 12:29:24 UTC
Size:
4.10 KB
patch
obsolete
>(updated by agriffis to apply to 4.3.99.901) > >Patch by Chris Ahna, updated by Aron Griffis for 4.3.99.901: > >Fixes critical page size problems on ia64 architecture. See following >URL for details: > >https://external-lists.valinux.com/archives/linux-ia64/2001-August/002037.html > >Comment by mharris@redhat.com: > >This probably should be rewritten to be outside of the drivers >themselves so that it doesn't have to be done per-driver. I'm >applying this to our XFree86 for now however until I've got time to >investigate doing it more generically. > >--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.agriffis 2003-11-21 00:59:08.000000000 -0500 >+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2003-12-09 14:26:56.000000000 -0500 >@@ -55,15 +55,7 @@ > #include "GL/glxtokens.h" > #include "sarea.h" > >-/* ?? HACK - for now, put this here... */ >-/* ?? Alpha - this may need to be a variable to handle UP1x00 vs TITAN */ >-#if defined(__alpha__) >-# define DRM_PAGE_SIZE 8192 >-#elif defined(__ia64__) >-# define DRM_PAGE_SIZE getpagesize() >-#else >-# define DRM_PAGE_SIZE 4096 >-#endif >+static size_t r128_drm_page_size; > > static void R128DRITransitionTo2d(ScreenPtr pScreen); > static void R128DRITransitionTo3d(ScreenPtr pScreen); >@@ -501,11 +493,11 @@ > > /* Initialize the CCE ring buffer data */ > info->ringStart = info->agpOffset; >- info->ringMapSize = info->ringSize*1024*1024 + DRM_PAGE_SIZE; >+ info->ringMapSize = info->ringSize*1024*1024 + r128_drm_page_size; > info->ringSizeLog2QW = R128MinBits(info->ringSize*1024*1024/8) - 1; > > info->ringReadOffset = info->ringStart + info->ringMapSize; >- info->ringReadMapSize = DRM_PAGE_SIZE; >+ info->ringReadMapSize = r128_drm_page_size; > > /* Reserve space for vertex/indirect buffers */ > info->bufStart = info->ringReadOffset + info->ringReadMapSize; >@@ -654,11 +646,11 @@ > > /* Initialize the CCE ring buffer data */ > info->ringStart = info->agpOffset; >- info->ringMapSize = info->ringSize*1024*1024 + DRM_PAGE_SIZE; >+ info->ringMapSize = info->ringSize*1024*1024 + r128_drm_page_size; > info->ringSizeLog2QW = R128MinBits(info->ringSize*1024*1024/8) - 1; > > info->ringReadOffset = info->ringStart + info->ringMapSize; >- info->ringReadMapSize = DRM_PAGE_SIZE; >+ info->ringReadMapSize = r128_drm_page_size; > > /* Reserve space for vertex/indirect buffers */ > info->bufStart = info->ringReadOffset + info->ringReadMapSize; >@@ -1015,6 +1007,8 @@ > break; > } > >+ r128_drm_page_size = getpagesize(); >+ > /* Create the DRI data structure, and fill it in before calling the > DRIScreenInit(). */ > if (!(pDRIInfo = DRICreateInfoRec())) return FALSE; >--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c.agriffis 2003-11-21 00:59:08.000000000 -0500 >+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003-12-09 14:28:21.000000000 -0500 >@@ -56,15 +56,7 @@ > #include "sarea.h" > #include "radeon_sarea.h" > >-/* HACK - for now, put this here... */ >-/* Alpha - this may need to be a variable to handle UP1x00 vs TITAN */ >-#if defined(__alpha__) >-# define DRM_PAGE_SIZE 8192 >-#elif defined(__ia64__) >-# define DRM_PAGE_SIZE getpagesize() >-#else >-# define DRM_PAGE_SIZE 4096 >-#endif >+static size_t radeon_drm_page_size; > > > static Bool RADEONDRICloseFullScreen(ScreenPtr pScreen); >@@ -692,11 +684,11 @@ > > /* Initialize the CP ring buffer data */ > info->ringStart = info->gartOffset; >- info->ringMapSize = info->ringSize*1024*1024 + DRM_PAGE_SIZE; >+ info->ringMapSize = info->ringSize*1024*1024 + radeon_drm_page_size; > info->ringSizeLog2QW = RADEONMinBits(info->ringSize*1024*1024/8)-1; > > info->ringReadOffset = info->ringStart + info->ringMapSize; >- info->ringReadMapSize = DRM_PAGE_SIZE; >+ info->ringReadMapSize = radeon_drm_page_size; > > /* Reserve space for vertex/indirect buffers */ > info->bufStart = info->ringReadOffset + info->ringReadMapSize; >@@ -1227,6 +1219,8 @@ > break; > } > >+ radeon_drm_page_size = getpagesize(); >+ > /* Create the DRI data structure, and fill it in before calling the > * DRIScreenInit(). > */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 35467
: 21940 |
21941