[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08
Thomas White
taw at bitwiz.org.uk
Fri Jan 8 13:24:47 UTC 2010
The following commit has been merged in the master branch:
commit ee235f08f1cd4ffc96fcd3e9a690c2c954afd663
Author: Thomas White <taw at bitwiz.org.uk>
Date: Wed Aug 12 23:46:46 2009 +0100
Tidy up headers, formatting and unused code
diff --git a/src/glamo-dri2.c b/src/glamo-dri2.c
index b500067..4186bfa 100644
--- a/src/glamo-dri2.c
+++ b/src/glamo-dri2.c
@@ -58,7 +58,7 @@ typedef struct {
static DRI2BufferPtr glamoCreateBuffers(DrawablePtr pDraw,
- unsigned int *attachments, int count)
+ unsigned int *attachments, int count)
{
ScreenPtr pScreen = pDraw->pScreen;
DRI2BufferPtr buffers;
@@ -93,10 +93,10 @@ static DRI2BufferPtr glamoCreateBuffers(DrawablePtr pDraw,
/* Anything else - create a new pixmap */
pPixmap = (*pScreen->CreatePixmap)(pScreen,
- pDraw->width,
- pDraw->height,
- pDraw->depth,
- 0);
+ pDraw->width,
+ pDraw->height,
+ pDraw->depth,
+ 0);
}
@@ -117,7 +117,7 @@ static DRI2BufferPtr glamoCreateBuffers(DrawablePtr pDraw,
static void glamoDestroyBuffers(DrawablePtr pDraw,
- DRI2BufferPtr buffers, int count)
+ DRI2BufferPtr buffers, int count)
{
ScreenPtr pScreen = pDraw->pScreen;
int i;
@@ -136,7 +136,7 @@ static void glamoDestroyBuffers(DrawablePtr pDraw,
static void glamoCopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
- DRI2BufferPtr pDestBuffer, DRI2BufferPtr pSrcBuffer)
+ DRI2BufferPtr pDestBuffer, DRI2BufferPtr pSrcBuffer)
{
}
diff --git a/src/glamo-kms-crtc.c b/src/glamo-kms-crtc.c
index aafc539..17444b0 100644
--- a/src/glamo-kms-crtc.c
+++ b/src/glamo-kms-crtc.c
@@ -58,6 +58,7 @@
#include <X11/extensions/dpms.h>
#include "glamo.h"
+#include "glamo-kms-crtc.h"
struct crtc_private
diff --git a/src/glamo-kms-crtc.h b/src/glamo-kms-crtc.h
index 8c16054..1860b2d 100644
--- a/src/glamo-kms-crtc.h
+++ b/src/glamo-kms-crtc.h
@@ -22,9 +22,4 @@
#include "xf86.h"
-/* crtc.c */
extern void crtc_init(ScrnInfoPtr pScrn);
-
-
-/* output.c */
-extern void output_init(ScrnInfoPtr pScrn);
diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index bf47131..55d2377 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -72,6 +72,7 @@
#include "glamo-kms-exa.h"
#include "glamo-dri2.h"
#include "glamo-kms-crtc.h"
+#include "glamo-kms-output.h"
static const char *fbSymbols[] = {
@@ -489,7 +490,7 @@ void GlamoKMSLeaveVT(int scrnIndex, int flags)
ModeStatus GlamoKMSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags)
+ int flags)
{
return MODE_OK;
}
diff --git a/src/glamo-kms-exa.c b/src/glamo-kms-exa.c
index 3d9701f..5303aeb 100644
--- a/src/glamo-kms-exa.c
+++ b/src/glamo-kms-exa.c
@@ -54,6 +54,7 @@
#include "glamo-log.h"
#include "glamo.h"
#include "glamo-regs.h"
+#include "glamo-kms-exa.h"
#include <drm/glamo_drm.h>
#include <drm/glamo_bo.h>
@@ -195,7 +196,7 @@ unsigned int driGetPixmapHandle(PixmapPtr pPixmap, unsigned int *flags)
}
-Bool GlamoKMSExaPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
+static Bool GlamoKMSExaPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
{
ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -228,7 +229,7 @@ Bool GlamoKMSExaPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
}
-void GlamoKMSExaSolid(PixmapPtr pPix, int x1, int y1, int x2, int y2)
+static void GlamoKMSExaSolid(PixmapPtr pPix, int x1, int y1, int x2, int y2)
{
ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -241,7 +242,7 @@ void GlamoKMSExaSolid(PixmapPtr pPix, int x1, int y1, int x2, int y2)
}
-void GlamoKMSExaDoneSolid(PixmapPtr pPix)
+static void GlamoKMSExaDoneSolid(PixmapPtr pPix)
{
ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -251,8 +252,8 @@ void GlamoKMSExaDoneSolid(PixmapPtr pPix)
}
-Bool GlamoKMSExaPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy,
- int alu, Pixel pm)
+static Bool GlamoKMSExaPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy,
+ int alu, Pixel pm)
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -299,8 +300,8 @@ Bool GlamoKMSExaPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy,
}
-void GlamoKMSExaCopy(PixmapPtr pDst, int srcX, int srcY, int dstX, int dstY,
- int width, int height)
+static void GlamoKMSExaCopy(PixmapPtr pDst, int srcX, int srcY,
+ int dstX, int dstY, int width, int height)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -315,7 +316,7 @@ void GlamoKMSExaCopy(PixmapPtr pDst, int srcX, int srcY, int dstX, int dstY,
}
-void GlamoKMSExaDoneCopy(PixmapPtr pDst)
+static void GlamoKMSExaDoneCopy(PixmapPtr pDst)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -325,39 +326,13 @@ void GlamoKMSExaDoneCopy(PixmapPtr pDst)
}
-Bool GlamoKMSExaCheckComposite(int op,
- PicturePtr pSrcPicture,
- PicturePtr pMaskPicture,
- PicturePtr pDstPicture)
-{
- return FALSE;
-}
-
-
-Bool GlamoKMSExaPrepareComposite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture,
- PicturePtr pDstPicture,
- PixmapPtr pSrc,
- PixmapPtr pMask,
- PixmapPtr pDst)
-{
- return FALSE;
-}
-
-
-void GlamoKMSExaComposite(PixmapPtr pDst, int srcX, int srcY,
- int maskX, int maskY, int dstX, int dstY,
- int width, int height)
-{
-}
-
-
-void GlamoKMSExaDoneComposite(PixmapPtr pDst)
+static int GlamoKMSExaMarkSync(ScreenPtr pScreen)
{
+ return 1;
}
-void GlamoKMSExaWaitMarker(ScreenPtr pScreen, int marker)
+static void GlamoKMSExaWaitMarker(ScreenPtr pScreen, int marker)
{
// ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
// GlamoPtr pGlamo = GlamoPTR(pScrn);
@@ -564,16 +539,16 @@ void GlamoKMSExaInit(ScrnInfoPtr pScrn)
exa->DoneCopy = GlamoKMSExaDoneCopy;
/* Composite (though these just cause fallback) */
- exa->CheckComposite = GlamoKMSExaCheckComposite;
- exa->PrepareComposite = GlamoKMSExaPrepareComposite;
- exa->Composite = GlamoKMSExaComposite;
- exa->DoneComposite = GlamoKMSExaDoneComposite;
+ exa->CheckComposite = NULL;//GlamoKMSExaCheckComposite;
+ exa->PrepareComposite = NULL;//GlamoKMSExaPrepareComposite;
+ exa->Composite = NULL;//GlamoKMSExaComposite;
+ exa->DoneComposite = NULL;//GlamoKMSExaDoneComposite;
exa->DownloadFromScreen = NULL;
exa->UploadToScreen = NULL;
exa->UploadToScratch = NULL;
-// exa->MarkSync = GlamoKMSExaMarkSync;
+ exa->MarkSync = GlamoKMSExaMarkSync;
exa->WaitMarker = GlamoKMSExaWaitMarker;
/* Prepare temporary buffers */
diff --git a/src/glamo-kms-exa.h b/src/glamo-kms-exa.h
index 45b8eb7..6452050 100644
--- a/src/glamo-kms-exa.h
+++ b/src/glamo-kms-exa.h
@@ -22,6 +22,6 @@
#include "xf86.h"
-extern void *GlamoKMSExaInit(ScrnInfoPtr pScrn);
+extern void GlamoKMSExaInit(ScrnInfoPtr pScrn);
extern void GlamoKMSExaClose(ScrnInfoPtr pScrn);
extern unsigned int driGetPixmapHandle(PixmapPtr pPixmap, unsigned int *flags);
diff --git a/src/glamo-kms-output.c b/src/glamo-kms-output.c
index 991a8be..f9f5ff6 100644
--- a/src/glamo-kms-output.c
+++ b/src/glamo-kms-output.c
@@ -57,6 +57,7 @@
#include <xf86drmMode.h>
#include "glamo.h"
+#include "glamo-kms-output.h"
static char *connector_enum_list[] = {
diff --git a/src/glamo-kms-display.h b/src/glamo-kms-output.h
similarity index 77%
rename from src/glamo-kms-display.h
rename to src/glamo-kms-output.h
index 45b8eb7..0bb7565 100644
--- a/src/glamo-kms-display.h
+++ b/src/glamo-kms-output.h
@@ -1,5 +1,5 @@
/*
- * EXA via DRI for the SMedia Glamo3362 X.org Driver
+ * KMS Support for the SMedia Glamo3362 X.org Driver
*
* Copyright 2009 Thomas White <taw at bitwiz.org.uk>
*
@@ -22,6 +22,4 @@
#include "xf86.h"
-extern void *GlamoKMSExaInit(ScrnInfoPtr pScrn);
-extern void GlamoKMSExaClose(ScrnInfoPtr pScrn);
-extern unsigned int driGetPixmapHandle(PixmapPtr pPixmap, unsigned int *flags);
+extern void output_init(ScrnInfoPtr pScrn);
--
xf86-video-glamo, SMedia Glamo video driver for X.Org
More information about the pkg-fso-commits
mailing list