summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-02-19 13:07:19 +0100
committerThierry Reding <treding@nvidia.com>2014-07-09 11:44:56 +0200
commit01f7bcf7067633653b8e8e52bcda86c8edd2fd7a (patch)
tree4f622c2abc2cd8eb4c1586f87fbb6367df2a23a7
parentc1827943a811ace288a56b5ce9711e7bd86def9d (diff)
Formatting cleanups
Add vim modelines to automatically adjust to the coding style used in this driver. Fix some indentation and whitespace inconsistencies. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--src/driver.c5
-rw-r--r--src/driver.h2
-rw-r--r--src/drmmode_display.c2
-rw-r--r--src/drmmode_display.h7
4 files changed, 12 insertions, 4 deletions
diff --git a/src/driver.c b/src/driver.c
index 377939e..79e9f2f 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -267,7 +267,7 @@ TegraAvailableOptions(int chipid, int busid)
}
static Bool
-TegraDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data)
+TegraDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *data)
{
xorgHWFlags *flag;
@@ -518,6 +518,7 @@ TegraCreateScreenResources(ScreenPtr pScreen)
PixmapPtr rootPixmap;
Bool ret;
void *pixels;
+
pScreen->CreateScreenResources = tegra->createScreenResources;
ret = pScreen->CreateScreenResources(pScreen);
pScreen->CreateScreenResources = TegraCreateScreenResources;
@@ -910,3 +911,5 @@ static XF86ModuleVersionInfo VersRec = {
};
_X_EXPORT XF86ModuleData opentegraModuleData = { &VersRec, Setup, NULL };
+
+/* vim: set et sts=4 sw=4 ts=4: */
diff --git a/src/driver.h b/src/driver.h
index 3c7408a..b518642 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -66,3 +66,5 @@ typedef struct _TegraRec
} TegraRec, *TegraPtr;
#define TegraPTR(p) ((TegraPtr)((p)->driverPrivate))
+
+/* vim: set et sts=4 sw=4 ts=4: */
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 17ca446..85a3a1a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1539,3 +1539,5 @@ out:
drmModeFreeResources(mode_res);
return;
}
+
+/* vim: set et sts=4 sw=4 ts=4: */
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 8ca89c7..1a8aa72 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -122,9 +122,8 @@ extern DevPrivateKeyRec TegraPixmapPrivateKeyRec;
#define TegraGetPixmapPriv(drmmode, p) ((TegraPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
void *drmmode_map_slave_bo(drmmode_ptr drmmode, TegraPixmapPrivPtr ppriv);
-Bool drmmode_SetSlaveBO(PixmapPtr ppix,
- drmmode_ptr drmmode,
- int fd_handle, int pitch, int size);
+Bool drmmode_SetSlaveBO(PixmapPtr ppix, drmmode_ptr drmmode, int fd_handle,
+ int pitch, int size);
#endif
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
@@ -150,3 +149,5 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth
#endif
#endif
+
+/* vim: set et sts=4 sw=4 ts=4: */