Ensure drivers can use new modes header files.
New modes header files required a few minor changes to be used by external drivers, the most notable of which is the publication of the config file parser header files.
This commit is contained in:
parent
55797dd252
commit
096965ec9c
|
@ -41,6 +41,9 @@
|
|||
#define DPMS_SERVER
|
||||
#include "X11/extensions/dpms.h"
|
||||
#include "X11/Xatom.h"
|
||||
#ifdef RENDER
|
||||
#include "picturestr.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Initialize xf86CrtcConfig structure
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include "xf86Rename.h"
|
||||
#endif
|
||||
#include "xf86Modes.h"
|
||||
#include "xf86Parser.h"
|
||||
#include "damage.h"
|
||||
|
||||
/* Compat definitions for older X Servers. */
|
||||
|
|
|
@ -35,6 +35,8 @@
|
|||
#include "xf86Crtc.h"
|
||||
#include "xf86Modes.h"
|
||||
#include "gcstruct.h"
|
||||
#include "scrnintstr.h"
|
||||
#include "windowstr.h"
|
||||
|
||||
static Bool
|
||||
xf86_dga_get_modes (ScreenPtr pScreen)
|
||||
|
|
|
@ -36,11 +36,6 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86Modes.h"
|
||||
#include "xf86Priv.h"
|
||||
|
||||
|
|
|
@ -25,11 +25,17 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef _I830_XF86MODES_H_
|
||||
#define _I830_XF86MODES_H_
|
||||
#ifndef _XF86MODES_H_
|
||||
#define _XF86MODES_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xorgVersion.h"
|
||||
#include "xf86Parser.h"
|
||||
#include "edid.h"
|
||||
#include "xf86Parser.h"
|
||||
#if XF86_MODES_RENAME
|
||||
#include "xf86Rename.h"
|
||||
#endif
|
||||
|
@ -89,4 +95,4 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor);
|
|||
DisplayModePtr
|
||||
xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed);
|
||||
|
||||
#endif /* _I830_XF86MODES_H_ */
|
||||
#endif /* _XF86MODES_H_ */
|
||||
|
|
|
@ -496,19 +496,18 @@ void
|
|||
xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
|
||||
{
|
||||
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
|
||||
int c;
|
||||
|
||||
randrp->supported_rotations = rotations;
|
||||
|
||||
#if RANDR_12_INTERFACE
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
int c;
|
||||
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
|
||||
|
||||
for (c = 0; c < config->num_crtc; c++) {
|
||||
xf86CrtcPtr crtc = config->crtc[c];
|
||||
|
||||
RRCrtcSetRotations (crtc->randr_crtc, rotations);
|
||||
}
|
||||
#endif
|
||||
randrp->supported_rotations = rotations;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -36,4 +36,6 @@ EXTRA_DIST = \
|
|||
cpconfig.c
|
||||
|
||||
sdk_HEADERS = \
|
||||
$(LIBHEADERS)
|
||||
$(LIBHEADERS) \
|
||||
xf86Parser.h \
|
||||
xf86Optrec.h
|
||||
|
|
Loading…
Reference in New Issue
Block a user