projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: update rasterizer for ccw changes
[mesa.git]
/
src
/
gallium
/
state_trackers
/
xorg
/
xorg_output.c
diff --git
a/src/gallium/state_trackers/xorg/xorg_output.c
b/src/gallium/state_trackers/xorg/xorg_output.c
index bfeddc5e114ce0c9f9e4bb1c41d117d6fa8dcdc1..13c3fb97e3bd8b1581b5ce290cbd15e781f5e6f3 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_output.c
+++ b/
src/gallium/state_trackers/xorg/xorg_output.c
@@
-49,11
+49,9
@@
#include <X11/extensions/dpms.h>
#endif
#include <X11/extensions/dpms.h>
#endif
-#include "X11/Xatom.h"
-
#include "xorg_tracker.h"
#include "xorg_tracker.h"
-static char *
connector
_enum_list[] = {
+static char *
output
_enum_list[] = {
"Unknown",
"VGA",
"DVI",
"Unknown",
"VGA",
"DVI",
@@
-70,19
+68,19
@@
static char *connector_enum_list[] = {
};
static void
};
static void
-create_resources(xf86OutputPtr output)
+
output_
create_resources(xf86OutputPtr output)
{
#ifdef RANDR_12_INTERFACE
#endif /* RANDR_12_INTERFACE */
}
static void
{
#ifdef RANDR_12_INTERFACE
#endif /* RANDR_12_INTERFACE */
}
static void
-dpms(xf86OutputPtr output, int mode)
+
output_
dpms(xf86OutputPtr output, int mode)
{
}
static xf86OutputStatus
{
}
static xf86OutputStatus
-detect(xf86OutputPtr output)
+
output_
detect(xf86OutputPtr output)
{
drmModeConnectorPtr drm_connector = output->driver_private;
{
drmModeConnectorPtr drm_connector = output->driver_private;
@@
-97,7
+95,7
@@
detect(xf86OutputPtr output)
}
static DisplayModePtr
}
static DisplayModePtr
-get_modes(xf86OutputPtr output)
+
output_
get_modes(xf86OutputPtr output)
{
drmModeConnectorPtr drm_connector = output->driver_private;
drmModeModeInfoPtr drm_mode = NULL;
{
drmModeConnectorPtr drm_connector = output->driver_private;
drmModeModeInfoPtr drm_mode = NULL;
@@
-110,7
+108,6
@@
get_modes(xf86OutputPtr output)
mode = xcalloc(1, sizeof(DisplayModeRec));
if (!mode)
continue;
mode = xcalloc(1, sizeof(DisplayModeRec));
if (!mode)
continue;
- mode->type = 0;
mode->Clock = drm_mode->clock;
mode->HDisplay = drm_mode->hdisplay;
mode->HSyncStart = drm_mode->hsync_start;
mode->Clock = drm_mode->clock;
mode->HDisplay = drm_mode->hdisplay;
mode->HSyncStart = drm_mode->hsync_start;
@@
-125,6
+122,11
@@
get_modes(xf86OutputPtr output)
mode->VScan = drm_mode->vscan;
mode->VRefresh = xf86ModeVRefresh(mode);
mode->Private = (void *)drm_mode;
mode->VScan = drm_mode->vscan;
mode->VRefresh = xf86ModeVRefresh(mode);
mode->Private = (void *)drm_mode;
+ mode->type = 0;
+ if (drm_mode->type & DRM_MODE_TYPE_PREFERRED)
+ mode->type |= M_T_PREFERRED;
+ if (drm_mode->type & DRM_MODE_TYPE_DRIVER)
+ mode->type |= M_T_DRIVER;
xf86SetModeDefaultName(mode);
modes = xf86ModesAdd(modes, mode);
xf86PrintModeline(0, mode);
xf86SetModeDefaultName(mode);
modes = xf86ModesAdd(modes, mode);
xf86PrintModeline(0, mode);
@@
-135,14
+137,14
@@
get_modes(xf86OutputPtr output)
}
static int
}
static int
-mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+
output_
mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
{
return MODE_OK;
}
#ifdef RANDR_12_INTERFACE
static Bool
{
return MODE_OK;
}
#ifdef RANDR_12_INTERFACE
static Bool
-set_property(xf86OutputPtr output, Atom property, RRPropertyValuePtr value)
+
output_
set_property(xf86OutputPtr output, Atom property, RRPropertyValuePtr value)
{
return TRUE;
}
{
return TRUE;
}
@@
-150,36
+152,36
@@
set_property(xf86OutputPtr output, Atom property, RRPropertyValuePtr value)
#ifdef RANDR_13_INTERFACE
static Bool
#ifdef RANDR_13_INTERFACE
static Bool
-get_property(xf86OutputPtr output, Atom property)
+
output_
get_property(xf86OutputPtr output, Atom property)
{
return TRUE;
}
#endif /* RANDR_13_INTERFACE */
static void
{
return TRUE;
}
#endif /* RANDR_13_INTERFACE */
static void
-destroy(xf86OutputPtr output)
+
output_
destroy(xf86OutputPtr output)
{
drmModeFreeConnector(output->driver_private);
}
static const xf86OutputFuncsRec output_funcs = {
{
drmModeFreeConnector(output->driver_private);
}
static const xf86OutputFuncsRec output_funcs = {
- .create_resources = create_resources,
+ .create_resources =
output_
create_resources,
#ifdef RANDR_12_INTERFACE
#ifdef RANDR_12_INTERFACE
- .set_property = set_property,
+ .set_property =
output_
set_property,
#endif
#ifdef RANDR_13_INTERFACE
#endif
#ifdef RANDR_13_INTERFACE
- .get_property = get_property,
+ .get_property =
output_
get_property,
#endif
#endif
- .dpms = dpms,
- .detect = detect,
+ .dpms =
output_
dpms,
+ .detect =
output_
detect,
- .get_modes = get_modes,
- .mode_valid = mode_valid,
- .destroy = destroy,
+ .get_modes =
output_
get_modes,
+ .mode_valid =
output_
mode_valid,
+ .destroy =
output_
destroy,
};
void
};
void
-output_init(ScrnInfoPtr pScrn)
+
xorg_
output_init(ScrnInfoPtr pScrn)
{
modesettingPtr ms = modesettingPTR(pScrn);
xf86OutputPtr output;
{
modesettingPtr ms = modesettingPTR(pScrn);
xf86OutputPtr output;
@@
-220,7
+222,7
@@
output_init(ScrnInfoPtr pScrn)
#endif
snprintf(name, 32, "%s%d",
#endif
snprintf(name, 32, "%s%d",
-
connector
_enum_list[drm_connector->connector_type],
+
output
_enum_list[drm_connector->connector_type],
drm_connector->connector_type_id);
drm_connector->connector_type_id);