From 96e0ab54962ab59f03275a098ee02c1f0f86b94e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 26 Jan 2012 15:44:40 -0800 Subject: [PATCH 1/4] Convert sbusPaletteKey to latest DevPrivate API Signed-off-by: Alan Coopersmith Reviewed-by: Mark Kettenis Reviewed-by: Dave Airlie --- hw/xfree86/common/xf86sbusBus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index c993b603c..27d24f8e1 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -619,8 +619,9 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp) pScrn->virtualY = psdp->height; } -static sbusPaletteKeyIndex; -static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex; +static DevPrivateKeyRec sbusPaletteKeyRec; +#define sbusPaletteKey (&sbusPaletteKeyRec) + typedef struct _sbusCmap { sbusDevicePtr psdp; CloseScreenProcPtr CloseScreen; @@ -692,6 +693,9 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp) struct fbcmap fbcmap; unsigned char data[2]; + if (!dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0)) + FatalError("Cannot register sbus private key"); + cmap = xnfcalloc(1, sizeof(sbusCmapRec)); dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap); cmap->psdp = psdp; From c3180a74a4fc6304bcfe676e3285d707874a9fea Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 6 Apr 2012 21:51:37 -0700 Subject: [PATCH 2/4] cvt man page should use Hz, not kHz, for vertical refresh rate https://bugs.freedesktop.org/show_bug.cgi?id=48311 Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau --- hw/xfree86/utils/man/cvt.man | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/utils/man/cvt.man b/hw/xfree86/utils/man/cvt.man index 310e46405..8d70ead1b 100644 --- a/hw/xfree86/utils/man/cvt.man +++ b/hw/xfree86/utils/man/cvt.man @@ -19,8 +19,8 @@ standard is printed. This modeline can be included in Xorg .SH OPTIONS .TP 8 .BR refresh -Provide a vertical refresh rate in kHz. The CVT standard prefers either 50.0, -60.0, 75.0 or 85.0kHz. The default is 60.0kHz. +Provide a vertical refresh rate in Hz. The CVT standard prefers either 50.0, +60.0, 75.0 or 85.0Hz. The default is 60.0Hz. .TP 8 .BR \-v | \-\-verbose Warn verbosely when a given mode does not completely correspond with CVT From afcb7ba24ebd9968d48a192df438e7f1c0ecb770 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 27 Apr 2012 13:31:56 -0700 Subject: [PATCH 3/4] Undocument mandatory loadable modules The code to implement was deleted when BaseModules[] was emptied by the replacement of the "pcidata" module with libpciaccess calls in commit 46f55f5dead5d70cdff30531d80a72f6be042315. Signed-off-by: Alan Coopersmith Reviewed-by: Dave Airlie Reviewed-by: Adam Jackson --- hw/xfree86/doc/ddxDesign.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index ca5efc9be..7a6dce1aa 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -664,11 +664,6 @@ Here is what InitOutput() does: This is done at the start of the first server generation only. - - The core server contains a list of mandatory modules. These are loaded - first. Currently the only module on this list is the bitmap font module. - - The next set of modules loaded are those specified explicitly in the &k.module; section of the config file. From 5a3a98fcb799c2ac8fa7494645ad9030f1cac837 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 27 Apr 2012 13:35:32 -0700 Subject: [PATCH 4/4] Undocument Font Module loading Code was deleted in commit affec10635343668839994ea2bac16c1d4524200 Signed-off-by: Alan Coopersmith Reviewed-by: Dave Airlie Reviewed-by: Adam Jackson --- hw/xfree86/doc/ddxDesign.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index 7a6dce1aa..6a087322f 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -5989,26 +5989,6 @@ typedef struct { -
- - void LoadFont(FontModule *font); - -
- This registers the entry points for the font rasteriser module - identified by font. The FontModule - struct is defined as: - - - typedef struct { - InitFont initFunc; - char * name; - pointer module; -} FontModule; - - - -
-