Remove definitions duplicated from drm_mode.h
I don't exactly know why these were duplicated before. Maybe libdrm didn't always vendored drm_mode.h from the kernel? In any case, we now do, so instead of having copy-pasted definitions, just include our vendored version which cannot be outdated. Contrary to what the comment says, drm.h doesn't include drm_mode.h, so we need to add the include. Signed-off-by: Simon Ser <contact@emersion.fr> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>main
parent
d034db142d
commit
b82ed182ca
116
xf86drmMode.h
116
xf86drmMode.h
|
@ -41,6 +41,7 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <drm.h>
|
#include <drm.h>
|
||||||
|
#include <drm_mode.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
@ -61,121 +62,6 @@ extern "C" {
|
||||||
* buffer object interface. This object needs to be pinned.
|
* buffer object interface. This object needs to be pinned.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* If we pickup an old version of drm.h which doesn't include drm_mode.h
|
|
||||||
* we should redefine defines. This is so that builds doesn't breaks with
|
|
||||||
* new libdrm on old kernels.
|
|
||||||
*/
|
|
||||||
#ifndef _DRM_MODE_H
|
|
||||||
|
|
||||||
#define DRM_DISPLAY_INFO_LEN 32
|
|
||||||
#define DRM_CONNECTOR_NAME_LEN 32
|
|
||||||
#define DRM_DISPLAY_MODE_LEN 32
|
|
||||||
#define DRM_PROP_NAME_LEN 32
|
|
||||||
|
|
||||||
#define DRM_MODE_TYPE_BUILTIN (1<<0)
|
|
||||||
#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN)
|
|
||||||
#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN)
|
|
||||||
#define DRM_MODE_TYPE_PREFERRED (1<<3)
|
|
||||||
#define DRM_MODE_TYPE_DEFAULT (1<<4)
|
|
||||||
#define DRM_MODE_TYPE_USERDEF (1<<5)
|
|
||||||
#define DRM_MODE_TYPE_DRIVER (1<<6)
|
|
||||||
|
|
||||||
/* Video mode flags */
|
|
||||||
/* bit compatible with the xorg definitions. */
|
|
||||||
#define DRM_MODE_FLAG_PHSYNC (1<<0)
|
|
||||||
#define DRM_MODE_FLAG_NHSYNC (1<<1)
|
|
||||||
#define DRM_MODE_FLAG_PVSYNC (1<<2)
|
|
||||||
#define DRM_MODE_FLAG_NVSYNC (1<<3)
|
|
||||||
#define DRM_MODE_FLAG_INTERLACE (1<<4)
|
|
||||||
#define DRM_MODE_FLAG_DBLSCAN (1<<5)
|
|
||||||
#define DRM_MODE_FLAG_CSYNC (1<<6)
|
|
||||||
#define DRM_MODE_FLAG_PCSYNC (1<<7)
|
|
||||||
#define DRM_MODE_FLAG_NCSYNC (1<<8)
|
|
||||||
#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */
|
|
||||||
#define DRM_MODE_FLAG_BCAST (1<<10)
|
|
||||||
#define DRM_MODE_FLAG_PIXMUX (1<<11)
|
|
||||||
#define DRM_MODE_FLAG_DBLCLK (1<<12)
|
|
||||||
#define DRM_MODE_FLAG_CLKDIV2 (1<<13)
|
|
||||||
#define DRM_MODE_FLAG_3D_MASK (0x1f<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_NONE (0<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (2<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (3<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (4<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_L_DEPTH (5<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14)
|
|
||||||
#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14)
|
|
||||||
|
|
||||||
/* DPMS flags */
|
|
||||||
/* bit compatible with the xorg definitions. */
|
|
||||||
#define DRM_MODE_DPMS_ON 0
|
|
||||||
#define DRM_MODE_DPMS_STANDBY 1
|
|
||||||
#define DRM_MODE_DPMS_SUSPEND 2
|
|
||||||
#define DRM_MODE_DPMS_OFF 3
|
|
||||||
|
|
||||||
/* Scaling mode options */
|
|
||||||
#define DRM_MODE_SCALE_NON_GPU 0
|
|
||||||
#define DRM_MODE_SCALE_FULLSCREEN 1
|
|
||||||
#define DRM_MODE_SCALE_NO_SCALE 2
|
|
||||||
#define DRM_MODE_SCALE_ASPECT 3
|
|
||||||
|
|
||||||
/* Dithering mode options */
|
|
||||||
#define DRM_MODE_DITHERING_OFF 0
|
|
||||||
#define DRM_MODE_DITHERING_ON 1
|
|
||||||
|
|
||||||
#define DRM_MODE_ENCODER_NONE 0
|
|
||||||
#define DRM_MODE_ENCODER_DAC 1
|
|
||||||
#define DRM_MODE_ENCODER_TMDS 2
|
|
||||||
#define DRM_MODE_ENCODER_LVDS 3
|
|
||||||
#define DRM_MODE_ENCODER_TVDAC 4
|
|
||||||
#define DRM_MODE_ENCODER_VIRTUAL 5
|
|
||||||
#define DRM_MODE_ENCODER_DSI 6
|
|
||||||
#define DRM_MODE_ENCODER_DPMST 7
|
|
||||||
#define DRM_MODE_ENCODER_DPI 8
|
|
||||||
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_Automatic 0
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_Unknown 0
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_DVID 3
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_DVIA 4
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_Composite 5
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_SVIDEO 6
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_Component 8
|
|
||||||
#define DRM_MODE_SUBCONNECTOR_SCART 9
|
|
||||||
|
|
||||||
#define DRM_MODE_CONNECTOR_Unknown 0
|
|
||||||
#define DRM_MODE_CONNECTOR_VGA 1
|
|
||||||
#define DRM_MODE_CONNECTOR_DVII 2
|
|
||||||
#define DRM_MODE_CONNECTOR_DVID 3
|
|
||||||
#define DRM_MODE_CONNECTOR_DVIA 4
|
|
||||||
#define DRM_MODE_CONNECTOR_Composite 5
|
|
||||||
#define DRM_MODE_CONNECTOR_SVIDEO 6
|
|
||||||
#define DRM_MODE_CONNECTOR_LVDS 7
|
|
||||||
#define DRM_MODE_CONNECTOR_Component 8
|
|
||||||
#define DRM_MODE_CONNECTOR_9PinDIN 9
|
|
||||||
#define DRM_MODE_CONNECTOR_DisplayPort 10
|
|
||||||
#define DRM_MODE_CONNECTOR_HDMIA 11
|
|
||||||
#define DRM_MODE_CONNECTOR_HDMIB 12
|
|
||||||
#define DRM_MODE_CONNECTOR_TV 13
|
|
||||||
#define DRM_MODE_CONNECTOR_eDP 14
|
|
||||||
#define DRM_MODE_CONNECTOR_VIRTUAL 15
|
|
||||||
#define DRM_MODE_CONNECTOR_DSI 16
|
|
||||||
#define DRM_MODE_CONNECTOR_DPI 17
|
|
||||||
#define DRM_MODE_CONNECTOR_WRITEBACK 18
|
|
||||||
|
|
||||||
#define DRM_MODE_PROP_PENDING (1<<0)
|
|
||||||
#define DRM_MODE_PROP_RANGE (1<<1)
|
|
||||||
#define DRM_MODE_PROP_IMMUTABLE (1<<2)
|
|
||||||
#define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */
|
|
||||||
#define DRM_MODE_PROP_BLOB (1<<4)
|
|
||||||
|
|
||||||
#define DRM_MODE_CURSOR_BO (1<<0)
|
|
||||||
#define DRM_MODE_CURSOR_MOVE (1<<1)
|
|
||||||
|
|
||||||
#endif /* _DRM_MODE_H */
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Feature defines
|
* Feature defines
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue