frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: Run x-indent-all.sh. 

As I was editing code, the top-level .dir-locals.el was making my new
stuff conflict with the existing style.  Make it consistently use the
xorg style, instead.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-10-08 00:39:15 -07:00
parent 95a5b92e37
commit 3119acdab9
4 changed files with 1452 additions and 1376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

565
hw/xfree86/drivers/modesetting/driver.c
View File

File diff suppressed because it is too large Load Diff

6
hw/xfree86/drivers/modesetting/driver.h
View File

@ -35,16 +35,14 @@
#include "drmmode_display.h" #include "drmmode_display.h"
#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg); #define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
typedef struct typedef struct {
{
int lastInstance; int lastInstance;
int refCount; int refCount;
ScrnInfoPtr pScrn_1; ScrnInfoPtr pScrn_1;
ScrnInfoPtr pScrn_2; ScrnInfoPtr pScrn_2;
} EntRec, *EntPtr; } EntRec, *EntPtr;
typedef struct _modesettingRec typedef struct _modesettingRec {
{
int fd; int fd;
EntPtr entityPrivate; EntPtr entityPrivate;

2243
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

File diff suppressed because it is too large Load Diff

14
hw/xfree86/drivers/modesetting/drmmode_display.h
View File

@ -74,11 +74,10 @@ typedef struct {
typedef struct { typedef struct {
drmModePropertyPtr mode_prop; drmModePropertyPtr mode_prop;
uint64_t value; uint64_t value;
int num_atoms; /* if range prop, num_atoms == 1; if enum prop, num_atoms == num_enums + 1 */ int num_atoms; /* if range prop, num_atoms == 1; if enum prop, num_atoms == num_enums + 1 */
Atom *atoms; Atom *atoms;
} drmmode_prop_rec, *drmmode_prop_ptr; } drmmode_prop_rec, *drmmode_prop_ptr;
typedef struct { typedef struct {
drmmode_ptr drmmode; drmmode_ptr drmmode;
int output_id; int output_id;
@ -97,16 +96,16 @@ typedef struct _msPixmapPriv {
struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */ struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */
} msPixmapPrivRec, *msPixmapPrivPtr; } msPixmapPrivRec, *msPixmapPrivPtr;
extern DevPrivateKeyRec msPixmapPrivateKeyRec; extern DevPrivateKeyRec msPixmapPrivateKeyRec;
#define msPixmapPrivateKey (&msPixmapPrivateKeyRec) #define msPixmapPrivateKey (&msPixmapPrivateKeyRec)
#define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec)) #define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv); void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv);
Bool drmmode_SetSlaveBO(PixmapPtr ppix, Bool drmmode_SetSlaveBO(PixmapPtr ppix,
drmmode_ptr drmmode, drmmode_ptr drmmode,
int fd_handle, int pitch, int size); int fd_handle, int pitch, int size);
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp); extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y); void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y);
@ -120,8 +119,8 @@ Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void *drmmode_map_front_bo(drmmode_ptr drmmode); void *drmmode_map_front_bo(drmmode_ptr drmmode);
Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth, int *bpp); void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode,
int *depth, int *bpp);
#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH #ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
#define DRM_CAP_DUMB_PREFERRED_DEPTH 3 #define DRM_CAP_DUMB_PREFERRED_DEPTH 3
@ -132,5 +131,4 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth
#define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
#endif #endif