Remove printing of the XFree86 screen mode list, and some other detritus.
This commit is contained in:
parent
e8fb40ab10
commit
dbb8135e10
|
|
@ -652,8 +652,6 @@ extern void I830ReadAllRegisters(I830Ptr pI830, I830RegPtr i830Reg);
|
|||
extern void I830ChangeFrontbuffer(ScrnInfoPtr pScrn,int buffer);
|
||||
extern Bool I830IsPrimary(ScrnInfoPtr pScrn);
|
||||
|
||||
extern void I830PrintModes(ScrnInfoPtr pScrn);
|
||||
extern Bool I830CheckModeSupport(ScrnInfoPtr pScrn, int x, int y, int mode);
|
||||
extern Bool I830Rotate(ScrnInfoPtr pScrn, DisplayModePtr mode);
|
||||
extern Bool I830FixOffset(ScrnInfoPtr pScrn, I830MemRange *mem);
|
||||
extern Bool I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg,
|
||||
|
|
|
|||
|
|
@ -1735,8 +1735,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
|
|||
|
||||
pI830->displayWidth = pScrn->displayWidth;
|
||||
|
||||
I830PrintModes(pScrn);
|
||||
|
||||
/* Don't need MMIO access anymore. */
|
||||
if (pI830->swfSaved) {
|
||||
OUTREG(SWF0, pI830->saveSWF0);
|
||||
|
|
|
|||
|
|
@ -55,96 +55,8 @@
|
|||
#include "i830_xf86Modes.h"
|
||||
#include <randrstr.h>
|
||||
|
||||
/* Established timings from EDID standard */
|
||||
static struct
|
||||
{
|
||||
int hsize;
|
||||
int vsize;
|
||||
int refresh;
|
||||
} est_timings[] = {
|
||||
{1280, 1024, 75},
|
||||
{1024, 768, 75},
|
||||
{1024, 768, 70},
|
||||
{1024, 768, 60},
|
||||
{1024, 768, 87},
|
||||
{832, 624, 75},
|
||||
{800, 600, 75},
|
||||
{800, 600, 72},
|
||||
{800, 600, 60},
|
||||
{800, 600, 56},
|
||||
{640, 480, 75},
|
||||
{640, 480, 72},
|
||||
{640, 480, 67},
|
||||
{640, 480, 60},
|
||||
{720, 400, 88},
|
||||
{720, 400, 70},
|
||||
};
|
||||
|
||||
#define DEBUG_REPROBE 1
|
||||
|
||||
void
|
||||
I830PrintModes(ScrnInfoPtr scrp)
|
||||
{
|
||||
DisplayModePtr p;
|
||||
float hsync, refresh = 0;
|
||||
char *desc, *desc2, *prefix, *uprefix;
|
||||
|
||||
if (scrp == NULL)
|
||||
return;
|
||||
|
||||
xf86DrvMsg(scrp->scrnIndex, scrp->virtualFrom, "Virtual size is %dx%d "
|
||||
"(pitch %d)\n", scrp->virtualX, scrp->virtualY,
|
||||
scrp->displayWidth);
|
||||
|
||||
p = scrp->modes;
|
||||
if (p == NULL)
|
||||
return;
|
||||
|
||||
do {
|
||||
desc = desc2 = "";
|
||||
if (p->HSync > 0.0)
|
||||
hsync = p->HSync;
|
||||
else if (p->HTotal > 0)
|
||||
hsync = (float)p->Clock / (float)p->HTotal;
|
||||
else
|
||||
hsync = 0.0;
|
||||
if (p->VTotal > 0)
|
||||
refresh = hsync * 1000.0 / p->VTotal;
|
||||
if (p->Flags & V_INTERLACE) {
|
||||
refresh *= 2.0;
|
||||
desc = " (I)";
|
||||
}
|
||||
if (p->Flags & V_DBLSCAN) {
|
||||
refresh /= 2.0;
|
||||
desc = " (D)";
|
||||
}
|
||||
if (p->VScan > 1) {
|
||||
refresh /= p->VScan;
|
||||
desc2 = " (VScan)";
|
||||
}
|
||||
if (p->VRefresh > 0.0)
|
||||
refresh = p->VRefresh;
|
||||
if (p->type & M_T_BUILTIN)
|
||||
prefix = "Built-in mode";
|
||||
else if (p->type & M_T_DEFAULT)
|
||||
prefix = "Default mode";
|
||||
else
|
||||
prefix = "Mode";
|
||||
if (p->type & M_T_USERDEF)
|
||||
uprefix = "*";
|
||||
else
|
||||
uprefix = " ";
|
||||
if (p->name)
|
||||
xf86DrvMsg(scrp->scrnIndex, X_CONFIG,
|
||||
"%s%s \"%s\"\n", uprefix, prefix, p->name);
|
||||
else
|
||||
xf86DrvMsg(scrp->scrnIndex, X_PROBED,
|
||||
"%s%s %dx%d (unnamed)\n",
|
||||
uprefix, prefix, p->HDisplay, p->VDisplay);
|
||||
p = p->next;
|
||||
} while (p != NULL && p != scrp->modes);
|
||||
}
|
||||
|
||||
static DisplayModePtr
|
||||
i830GetModeListTail(DisplayModePtr pModeList)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue