XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-25 18:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified:

Browse Source 
programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
Enable DRM support permanently, allowing its use for any CHIP_FAMILY >
    R300. Fix bug in naming Mesa3d driver (it was defaulting to r200)
This commit is contained in:
Vladimir Dergachev
2004-12-12 19:28:37 +00:00
parent 845df6dd96
commit 8a9077bc70
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/radeon_dri.c
View File

@@ -1255,14 +1255,12 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
info->pDRIInfo = pDRIInfo;
pDRIInfo->drmDriverName = RADEON_DRIVER_NAME;
if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) {
pDRIInfo->clientDriverName = R300_DRIVER_NAME;
} else
if ( info->ChipFamily >= CHIP_FAMILY_R200 )
pDRIInfo->clientDriverName = R200_DRIVER_NAME;
else
if ( (info->ChipFamily == CHIP_FAMILY_R300) ||
(info->ChipFamily == CHIP_FAMILY_R350) ||
(info->ChipFamily == CHIP_FAMILY_RV350) ) {
pDRIInfo->clientDriverName = R300_DRIVER_NAME;
} else
pDRIInfo->clientDriverName = RADEON_DRIVER_NAME;
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {

20
src/radeon_driver.c
View File

@@ -142,7 +142,6 @@ typedef enum {
OPTION_PAGE_FLIP,
OPTION_NO_BACKBUFFER,
OPTION_XV_DMA,
OPTION_R300_DRM,
#endif
OPTION_PANEL_OFF,
OPTION_DDC_MODE,
@@ -196,7 +195,6 @@ static const OptionInfoRec RADEONOptions[] = {
{ OPTION_PAGE_FLIP, "EnablePageFlip", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_NO_BACKBUFFER, "NoBackBuffer", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_XV_DMA, "DMAForXv", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_R300_DRM, "X_R300_DRM", OPTV_BOOLEAN, {0}, FALSE },
#endif
{ OPTION_PANEL_OFF, "PanelOff", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DDC_MODE, "DDCMode", OPTV_BOOLEAN, {0}, FALSE },
@@ -4712,20 +4710,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
info->directRenderingEnabled = FALSE;
} else if (info->ChipFamily >= CHIP_FAMILY_R300) {
if ( xf86ReturnOptValBool(info->Options, OPTION_R300_DRM, FALSE) ) {
xf86DrvMsg(scrnIndex, X_WARNING,
"Direct rendering support is highly experimental for "
"Radeon 9500/9700 and newer cards\n"
"\t\tIn fact, the only thing you could probably use it for is better 2d acceleration.\n"
"Enabling DRM support\n\n"
"\t*** Direct rendering support is highly experimental for Radeon 9500\n"
"\t*** and newer cards. In fact, the only thing you could probably use\n"
"\t*** it for is better 2d acceleration. The 3d mesa driver is not \n"
"\t*** provided in this tree. A very experimental (and incomplete)\n"
"\t*** version is available from http://r300.sourceforge.net\n"
"\t*** This message has been last modified on 12/12/04.\n\n"
);
info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
} else {
info->directRenderingEnabled = FALSE;
xf86DrvMsg(scrnIndex, X_WARNING,
"Direct rendering is not yet supported on "
"Radeon 9500 and newer cards. \n"
"\t\tTo enable it anyway turn on X_R300_DRM option. Note: this might lockup your computer\n");
}
} else if (info->IsSecondary) {
info->directRenderingEnabled = FALSE;
} else if (xf86IsEntityShared(info->pEnt->index)) {