Split off some functions into drm-util
This commit is contained in:
parent
c46605d605
commit
d1ca1ec16e
|
@ -0,0 +1,267 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <drm.h>
|
||||||
|
#include <drm_mode.h>
|
||||||
|
#include "drm-util.h"
|
||||||
|
|
||||||
|
int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
|
||||||
|
int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
|
||||||
|
mode->vtotal / 2) / mode->vtotal;
|
||||||
|
|
||||||
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
|
||||||
|
refresh *= 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
|
||||||
|
refresh /= 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mode->vscan > 1) {
|
||||||
|
refresh /= mode->vscan;
|
||||||
|
}
|
||||||
|
|
||||||
|
return refresh;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Constructed from http://edid.tv/manufacturer
|
||||||
|
static const char *get_manufacturer(uint16_t id) {
|
||||||
|
#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
|
||||||
|
switch (id) {
|
||||||
|
case ID('A', 'A', 'A'): return "Avolites Ltd";
|
||||||
|
case ID('A', 'C', 'I'): return "Ancor Communications Inc";
|
||||||
|
case ID('A', 'C', 'R'): return "Acer Technologies";
|
||||||
|
case ID('A', 'P', 'P'): return "Apple Computer Inc";
|
||||||
|
case ID('B', 'N', 'O'): return "Bang & Olufsen";
|
||||||
|
case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
|
||||||
|
case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
|
||||||
|
case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
|
||||||
|
case ID('D', 'E', 'L'): return "Dell Inc.";
|
||||||
|
case ID('D', 'O', 'N'): return "DENON, Ltd.";
|
||||||
|
case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
|
||||||
|
case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
|
||||||
|
case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
|
||||||
|
case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
|
||||||
|
case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
|
||||||
|
case ID('H', 'S', 'D'): return "HannStar Display Corp";
|
||||||
|
case ID('H', 'W', 'P'): return "Hewlett Packard";
|
||||||
|
case ID('I', 'N', 'T'): return "Interphase Corporation";
|
||||||
|
case ID('I', 'V', 'M'): return "Iiyama North America";
|
||||||
|
case ID('L', 'E', 'N'): return "Lenovo Group Limited";
|
||||||
|
case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
|
||||||
|
case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
|
||||||
|
case ID('M', 'E', 'I'): return "Panasonic Industry Company";
|
||||||
|
case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
|
||||||
|
case ID('M', 'T', 'X'): return "Matrox";
|
||||||
|
case ID('N', 'E', 'C'): return "NEC Corporation";
|
||||||
|
case ID('O', 'N', 'K'): return "ONKYO Corporation";
|
||||||
|
case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
|
||||||
|
case ID('O', 'T', 'M'): return "Optoma Corporation";
|
||||||
|
case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
|
||||||
|
case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
|
||||||
|
case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
|
||||||
|
case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
|
||||||
|
case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
|
||||||
|
case ID('S', 'A', 'M'): return "Samsung Electric Company";
|
||||||
|
case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
|
||||||
|
case ID('S', 'H', 'P'): return "Sharp Corporation";
|
||||||
|
case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
|
||||||
|
case ID('S', 'N', 'Y'): return "Sony";
|
||||||
|
case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
|
||||||
|
case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
|
||||||
|
case ID('T', 'S', 'T'): return "Transtream Inc";
|
||||||
|
case ID('U', 'N', 'K'): return "Unknown";
|
||||||
|
case ID('V', 'I', 'Z'): return "VIZIO, Inc";
|
||||||
|
case ID('V', 'S', 'C'): return "ViewSonic Corporation";
|
||||||
|
case ID('Y', 'M', 'H'): return "Yamaha Corporation";
|
||||||
|
default: return "Unknown";
|
||||||
|
}
|
||||||
|
#undef ID
|
||||||
|
}
|
||||||
|
|
||||||
|
/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
|
||||||
|
* We don't parse the EDID properly. We just expect to receive valid data.
|
||||||
|
*/
|
||||||
|
void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
|
||||||
|
if (!data || len < 128) {
|
||||||
|
snprintf(output->make, sizeof(output->make), "<Unknown>");
|
||||||
|
snprintf(output->model, sizeof(output->model), "<Unknown>");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t id = (data[8] << 8) | data[9];
|
||||||
|
snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
|
||||||
|
|
||||||
|
output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
|
||||||
|
output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
|
||||||
|
|
||||||
|
for (size_t i = 72; i <= 108; i += 18) {
|
||||||
|
uint16_t flag = (data[i] << 8) | data[i + 1];
|
||||||
|
if (flag == 0 && data[i + 3] == 0xFC) {
|
||||||
|
sprintf(output->model, "%.13s", &data[i + 5]);
|
||||||
|
|
||||||
|
// Monitor names are terminated by newline if they're too short
|
||||||
|
char *nl = strchr(output->model, '\n');
|
||||||
|
if (nl) {
|
||||||
|
*nl = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *conn_get_name(uint32_t type_id) {
|
||||||
|
switch (type_id) {
|
||||||
|
case DRM_MODE_CONNECTOR_Unknown: return "Unknown";
|
||||||
|
case DRM_MODE_CONNECTOR_VGA: return "VGA";
|
||||||
|
case DRM_MODE_CONNECTOR_DVII: return "DVI-I";
|
||||||
|
case DRM_MODE_CONNECTOR_DVID: return "DVI-D";
|
||||||
|
case DRM_MODE_CONNECTOR_DVIA: return "DVI-A";
|
||||||
|
case DRM_MODE_CONNECTOR_Composite: return "Composite";
|
||||||
|
case DRM_MODE_CONNECTOR_SVIDEO: return "SVIDEO";
|
||||||
|
case DRM_MODE_CONNECTOR_LVDS: return "LVDS";
|
||||||
|
case DRM_MODE_CONNECTOR_Component: return "Component";
|
||||||
|
case DRM_MODE_CONNECTOR_9PinDIN: return "DIN";
|
||||||
|
case DRM_MODE_CONNECTOR_DisplayPort: return "DP";
|
||||||
|
case DRM_MODE_CONNECTOR_HDMIA: return "HDMI-A";
|
||||||
|
case DRM_MODE_CONNECTOR_HDMIB: return "HDMI-B";
|
||||||
|
case DRM_MODE_CONNECTOR_TV: return "TV";
|
||||||
|
case DRM_MODE_CONNECTOR_eDP: return "eDP";
|
||||||
|
case DRM_MODE_CONNECTOR_VIRTUAL: return "Virtual";
|
||||||
|
case DRM_MODE_CONNECTOR_DSI: return "DSI";
|
||||||
|
default: return "Unknown";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key) {
|
||||||
|
for (size_t i = 0; i < n; ++i) {
|
||||||
|
if (arr[i] == key) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Store all of the non-recursive state in a struct, so we aren't literally
|
||||||
|
* passing 12 arguments to a function.
|
||||||
|
*/
|
||||||
|
struct match_state {
|
||||||
|
const size_t num_objs;
|
||||||
|
const uint32_t *restrict objs;
|
||||||
|
const size_t num_res;
|
||||||
|
size_t score;
|
||||||
|
size_t replaced;
|
||||||
|
uint32_t *restrict res;
|
||||||
|
uint32_t *restrict best;
|
||||||
|
const uint32_t *restrict orig;
|
||||||
|
bool exit_early;
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* skips: The number of SKIP elements encountered so far.
|
||||||
|
* score: The number of resources we've matched so far.
|
||||||
|
* replaced: The number of changes from the original solution.
|
||||||
|
* i: The index of the current element.
|
||||||
|
*
|
||||||
|
* This tries to match a solution as close to st->orig as it can.
|
||||||
|
*
|
||||||
|
* Returns whether we've set a new best element with this solution.
|
||||||
|
*/
|
||||||
|
static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
|
||||||
|
// Finished
|
||||||
|
if (i >= st->num_res) {
|
||||||
|
if (score > st->score || (score == st->score && replaced < st->replaced)) {
|
||||||
|
st->score = score;
|
||||||
|
st->replaced = replaced;
|
||||||
|
memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
|
||||||
|
|
||||||
|
if (st->score == st->num_objs && st->replaced == 0) {
|
||||||
|
st->exit_early = true;
|
||||||
|
}
|
||||||
|
st->exit_early = (st->score == st->num_res - skips
|
||||||
|
|| st->score == st->num_objs)
|
||||||
|
&& st->replaced == 0;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (st->orig[i] == SKIP) {
|
||||||
|
st->res[i] = SKIP;
|
||||||
|
return match_obj_(st, skips + 1, score, replaced, i + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Attempt to use the current solution first, to try and avoid
|
||||||
|
* recalculating everything
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
|
||||||
|
st->res[i] = st->orig[i];
|
||||||
|
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (st->orig[i] != UNMATCHED) {
|
||||||
|
++replaced;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_best = false;
|
||||||
|
for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
|
||||||
|
// We tried this earlier
|
||||||
|
if (st->res[i] == st->orig[i]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not compatable
|
||||||
|
if (!(st->objs[st->res[i]] & (1 << i))) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Already taken
|
||||||
|
if (is_taken(i, st->res, st->res[i])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
|
||||||
|
is_best = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (st->exit_early) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_best) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maybe this resource can't be matched
|
||||||
|
st->res[i] = UNMATCHED;
|
||||||
|
return match_obj_(st, skips, score, replaced, i + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
|
||||||
|
size_t num_res, const uint32_t res[static restrict num_res],
|
||||||
|
uint32_t out[static restrict num_res]) {
|
||||||
|
uint32_t solution[num_res];
|
||||||
|
|
||||||
|
struct match_state st = {
|
||||||
|
.num_objs = num_objs,
|
||||||
|
.num_res = num_res,
|
||||||
|
.score = 0,
|
||||||
|
.replaced = SIZE_MAX,
|
||||||
|
.objs = objs,
|
||||||
|
.res = solution,
|
||||||
|
.best = out,
|
||||||
|
.orig = res,
|
||||||
|
.exit_early = false,
|
||||||
|
};
|
||||||
|
|
||||||
|
match_obj_(&st, 0, 0, 0, 0);
|
||||||
|
return st.score;
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
#ifndef WLR_DRM_UTIL_H
|
||||||
|
#define WLR_DRM_UTIL_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <xf86drm.h>
|
||||||
|
#include <xf86drmMode.h>
|
||||||
|
#include <wlr/types/wlr_output.h>
|
||||||
|
|
||||||
|
// Calculates a more accurate refresh rate (mHz) than what mode itself provides
|
||||||
|
int32_t calculate_refresh_rate(drmModeModeInfo *mode);
|
||||||
|
// Populates the make/model/phys_{width,height} of output from the edid data
|
||||||
|
void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data);
|
||||||
|
// Returns the string representation of a DRM output type
|
||||||
|
const char *conn_get_name(uint32_t type_id);
|
||||||
|
|
||||||
|
// Part of match_obj
|
||||||
|
enum {
|
||||||
|
UNMATCHED = (uint32_t)-1,
|
||||||
|
SKIP = (uint32_t)-2,
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Tries to match some DRM objects with some other DRM resource.
|
||||||
|
* e.g. Match CRTCs with Encoders, CRTCs with Planes.
|
||||||
|
*
|
||||||
|
* objs contains a bit array which resources it can be matched with.
|
||||||
|
* e.g. Bit 0 set means can be matched with res[0]
|
||||||
|
*
|
||||||
|
* res contains an index of which objs it is matched with or UNMATCHED.
|
||||||
|
*
|
||||||
|
* This solution is left in out.
|
||||||
|
* Returns the total number of matched solutions.
|
||||||
|
*/
|
||||||
|
size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
|
||||||
|
size_t num_res, const uint32_t res[static restrict num_res],
|
||||||
|
uint32_t out[static restrict num_res]);
|
||||||
|
#endif
|
|
@ -16,26 +16,7 @@
|
||||||
#include <wlr/interfaces/wlr_output.h>
|
#include <wlr/interfaces/wlr_output.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include "drm.h"
|
#include "drm.h"
|
||||||
|
#include "drm-util.h"
|
||||||
static const char *conn_name[] = {
|
|
||||||
[DRM_MODE_CONNECTOR_Unknown] = "Unknown",
|
|
||||||
[DRM_MODE_CONNECTOR_VGA] = "VGA",
|
|
||||||
[DRM_MODE_CONNECTOR_DVII] = "DVI-I",
|
|
||||||
[DRM_MODE_CONNECTOR_DVID] = "DVI-D",
|
|
||||||
[DRM_MODE_CONNECTOR_DVIA] = "DVI-A",
|
|
||||||
[DRM_MODE_CONNECTOR_Composite] = "Composite",
|
|
||||||
[DRM_MODE_CONNECTOR_SVIDEO] = "SVIDEO",
|
|
||||||
[DRM_MODE_CONNECTOR_LVDS] = "LVDS",
|
|
||||||
[DRM_MODE_CONNECTOR_Component] = "Component",
|
|
||||||
[DRM_MODE_CONNECTOR_9PinDIN] = "DIN",
|
|
||||||
[DRM_MODE_CONNECTOR_DisplayPort] = "DP",
|
|
||||||
[DRM_MODE_CONNECTOR_HDMIA] = "HDMI-A",
|
|
||||||
[DRM_MODE_CONNECTOR_HDMIB] = "HDMI-B",
|
|
||||||
[DRM_MODE_CONNECTOR_TV] = "TV",
|
|
||||||
[DRM_MODE_CONNECTOR_eDP] = "eDP",
|
|
||||||
[DRM_MODE_CONNECTOR_VIRTUAL] = "Virtual",
|
|
||||||
[DRM_MODE_CONNECTOR_DSI] = "DSI",
|
|
||||||
};
|
|
||||||
|
|
||||||
static int cmp_plane(const void *arg1, const void *arg2)
|
static int cmp_plane(const void *arg1, const void *arg2)
|
||||||
{
|
{
|
||||||
|
@ -362,161 +343,10 @@ static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable)
|
||||||
wlr_drm_output_swap_buffers(output);
|
wlr_drm_output_swap_buffers(output);
|
||||||
} else {
|
} else {
|
||||||
drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
|
drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
|
||||||
DRM_MODE_DPMS_STANDBY);
|
DRM_MODE_DPMS_OFF);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key)
|
|
||||||
{
|
|
||||||
for (size_t i = 0; i < n; ++i) {
|
|
||||||
if (arr[i] == key) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Store all of the non-recursive state in a struct, so we aren't literally
|
|
||||||
* passing 12 arguments to a function.
|
|
||||||
*/
|
|
||||||
struct match_state {
|
|
||||||
const size_t num_objs;
|
|
||||||
const uint32_t *restrict objs;
|
|
||||||
const size_t num_res;
|
|
||||||
size_t score;
|
|
||||||
size_t replaced;
|
|
||||||
uint32_t *restrict res;
|
|
||||||
uint32_t *restrict best;
|
|
||||||
const uint32_t *restrict orig;
|
|
||||||
bool exit_early;
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
|
||||||
UNMATCHED = (uint32_t)-1,
|
|
||||||
SKIP = (uint32_t)-2,
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* skips: The number of SKIP elements encountered so far.
|
|
||||||
* score: The number of resources we've matched so far.
|
|
||||||
* replaced: The number of changes from the original solution.
|
|
||||||
* i: The index of the current element.
|
|
||||||
*
|
|
||||||
* This tries to match a solution as close to st->orig as it can.
|
|
||||||
*
|
|
||||||
* Returns whether we've set a new best element with this solution.
|
|
||||||
*/
|
|
||||||
static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
|
|
||||||
// Finished
|
|
||||||
if (i >= st->num_res) {
|
|
||||||
if (score > st->score || (score == st->score && replaced < st->replaced)) {
|
|
||||||
st->score = score;
|
|
||||||
st->replaced = replaced;
|
|
||||||
memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
|
|
||||||
|
|
||||||
if (st->score == st->num_objs && st->replaced == 0) {
|
|
||||||
st->exit_early = true;
|
|
||||||
}
|
|
||||||
st->exit_early = (st->score == st->num_res - skips
|
|
||||||
|| st->score == st->num_objs)
|
|
||||||
&& st->replaced == 0;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (st->orig[i] == SKIP) {
|
|
||||||
st->res[i] = SKIP;
|
|
||||||
return match_obj_(st, skips + 1, score, replaced, i + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Attempt to use the current solution first, to try and avoid
|
|
||||||
* recalculating everything
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
|
|
||||||
st->res[i] = st->orig[i];
|
|
||||||
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (st->orig[i] != UNMATCHED) {
|
|
||||||
++replaced;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_best = false;
|
|
||||||
for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
|
|
||||||
// We tried this earlier
|
|
||||||
if (st->res[i] == st->orig[i]) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not compatable
|
|
||||||
if (!(st->objs[st->res[i]] & (1 << i))) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Already taken
|
|
||||||
if (is_taken(i, st->res, st->res[i])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
|
|
||||||
is_best = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (st->exit_early) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_best) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Maybe this resource can't be matched
|
|
||||||
st->res[i] = UNMATCHED;
|
|
||||||
return match_obj_(st, skips, score, replaced, i + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Tries to match some DRM objects with some other DRM resource.
|
|
||||||
* e.g. Match CRTCs with Encoders, CRTCs with Planes.
|
|
||||||
*
|
|
||||||
* objs contains a bit array which resources it can be matched with.
|
|
||||||
* e.g. Bit 0 set means can be matched with res[0]
|
|
||||||
*
|
|
||||||
* res contains an index of which objs it is matched with or UNMATCHED.
|
|
||||||
*
|
|
||||||
* This solution is left in out.
|
|
||||||
* Returns the total number of matched solutions.
|
|
||||||
*/
|
|
||||||
static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
|
|
||||||
size_t num_res, const uint32_t res[static restrict num_res],
|
|
||||||
uint32_t out[static restrict num_res]) {
|
|
||||||
uint32_t solution[num_res];
|
|
||||||
|
|
||||||
struct match_state st = {
|
|
||||||
.num_objs = num_objs,
|
|
||||||
.num_res = num_res,
|
|
||||||
.score = 0,
|
|
||||||
.replaced = SIZE_MAX,
|
|
||||||
.objs = objs,
|
|
||||||
.res = solution,
|
|
||||||
.best = out,
|
|
||||||
.orig = res,
|
|
||||||
.exit_early = false,
|
|
||||||
};
|
|
||||||
|
|
||||||
match_obj_(&st, 0, 0, 0, 0);
|
|
||||||
return st.score;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
|
static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
|
||||||
// overlay, primary, cursor
|
// overlay, primary, cursor
|
||||||
for (int type = 0; type < 3; ++type) {
|
for (int type = 0; type < 3; ++type) {
|
||||||
|
@ -769,112 +599,6 @@ static struct wlr_output_impl output_impl = {
|
||||||
.swap_buffers = wlr_drm_output_swap_buffers,
|
.swap_buffers = wlr_drm_output_swap_buffers,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
|
|
||||||
int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
|
|
||||||
mode->vtotal / 2) / mode->vtotal;
|
|
||||||
|
|
||||||
if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
|
|
||||||
refresh *= 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
|
|
||||||
refresh /= 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode->vscan > 1) {
|
|
||||||
refresh /= mode->vscan;
|
|
||||||
}
|
|
||||||
|
|
||||||
return refresh;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Constructed from http://edid.tv/manufacturer
|
|
||||||
static const char *get_manufacturer(uint16_t id) {
|
|
||||||
#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
|
|
||||||
switch (id) {
|
|
||||||
case ID('A', 'A', 'A'): return "Avolites Ltd";
|
|
||||||
case ID('A', 'C', 'I'): return "Ancor Communications Inc";
|
|
||||||
case ID('A', 'C', 'R'): return "Acer Technologies";
|
|
||||||
case ID('A', 'P', 'P'): return "Apple Computer Inc";
|
|
||||||
case ID('B', 'N', 'O'): return "Bang & Olufsen";
|
|
||||||
case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
|
|
||||||
case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
|
|
||||||
case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
|
|
||||||
case ID('D', 'E', 'L'): return "Dell Inc.";
|
|
||||||
case ID('D', 'O', 'N'): return "DENON, Ltd.";
|
|
||||||
case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
|
|
||||||
case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
|
|
||||||
case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
|
|
||||||
case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
|
|
||||||
case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
|
|
||||||
case ID('H', 'S', 'D'): return "HannStar Display Corp";
|
|
||||||
case ID('H', 'W', 'P'): return "Hewlett Packard";
|
|
||||||
case ID('I', 'N', 'T'): return "Interphase Corporation";
|
|
||||||
case ID('I', 'V', 'M'): return "Iiyama North America";
|
|
||||||
case ID('L', 'E', 'N'): return "Lenovo Group Limited";
|
|
||||||
case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
|
|
||||||
case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
|
|
||||||
case ID('M', 'E', 'I'): return "Panasonic Industry Company";
|
|
||||||
case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
|
|
||||||
case ID('M', 'T', 'X'): return "Matrox";
|
|
||||||
case ID('N', 'E', 'C'): return "NEC Corporation";
|
|
||||||
case ID('O', 'N', 'K'): return "ONKYO Corporation";
|
|
||||||
case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
|
|
||||||
case ID('O', 'T', 'M'): return "Optoma Corporation";
|
|
||||||
case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
|
|
||||||
case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
|
|
||||||
case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
|
|
||||||
case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
|
|
||||||
case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
|
|
||||||
case ID('S', 'A', 'M'): return "Samsung Electric Company";
|
|
||||||
case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
|
|
||||||
case ID('S', 'H', 'P'): return "Sharp Corporation";
|
|
||||||
case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
|
|
||||||
case ID('S', 'N', 'Y'): return "Sony";
|
|
||||||
case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
|
|
||||||
case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
|
|
||||||
case ID('T', 'S', 'T'): return "Transtream Inc";
|
|
||||||
case ID('U', 'N', 'K'): return "Unknown";
|
|
||||||
case ID('V', 'I', 'Z'): return "VIZIO, Inc";
|
|
||||||
case ID('V', 'S', 'C'): return "ViewSonic Corporation";
|
|
||||||
case ID('Y', 'M', 'H'): return "Yamaha Corporation";
|
|
||||||
default: return "Unknown";
|
|
||||||
}
|
|
||||||
#undef ID
|
|
||||||
}
|
|
||||||
|
|
||||||
/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
|
|
||||||
* We don't parse the EDID properly. We just expect to receive valid data.
|
|
||||||
*/
|
|
||||||
static void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
|
|
||||||
if (!data || len < 128) {
|
|
||||||
snprintf(output->make, sizeof(output->make), "<Unknown>");
|
|
||||||
snprintf(output->model, sizeof(output->model), "<Unknown>");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t id = (data[8] << 8) | data[9];
|
|
||||||
snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
|
|
||||||
|
|
||||||
output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
|
|
||||||
output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
|
|
||||||
|
|
||||||
for (size_t i = 72; i <= 108; i += 18) {
|
|
||||||
uint16_t flag = (data[i] << 8) | data[i + 1];
|
|
||||||
if (flag == 0 && data[i + 3] == 0xFC) {
|
|
||||||
sprintf(output->model, "%.13s", &data[i + 5]);
|
|
||||||
|
|
||||||
// Monitor names are terminated by newline if they're too short
|
|
||||||
char *nl = strchr(output->model, '\n');
|
|
||||||
if (nl) {
|
|
||||||
*nl = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static const int32_t subpixel_map[] = {
|
static const int32_t subpixel_map[] = {
|
||||||
[DRM_MODE_SUBPIXEL_UNKNOWN] = WL_OUTPUT_SUBPIXEL_UNKNOWN,
|
[DRM_MODE_SUBPIXEL_UNKNOWN] = WL_OUTPUT_SUBPIXEL_UNKNOWN,
|
||||||
[DRM_MODE_SUBPIXEL_HORIZONTAL_RGB] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB,
|
[DRM_MODE_SUBPIXEL_HORIZONTAL_RGB] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB,
|
||||||
|
@ -934,7 +658,7 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *drm) {
|
||||||
output->base->phys_height = conn->mmHeight;
|
output->base->phys_height = conn->mmHeight;
|
||||||
output->base->subpixel = subpixel_map[conn->subpixel];
|
output->base->subpixel = subpixel_map[conn->subpixel];
|
||||||
snprintf(output->base->name, sizeof(output->base->name), "%s-%"PRIu32,
|
snprintf(output->base->name, sizeof(output->base->name), "%s-%"PRIu32,
|
||||||
conn_name[conn->connector_type],
|
conn_get_name(conn->connector_type),
|
||||||
conn->connector_type_id);
|
conn->connector_type_id);
|
||||||
|
|
||||||
wlr_drm_get_connector_props(drm->fd, output->connector, &output->props);
|
wlr_drm_get_connector_props(drm->fd, output->connector, &output->props);
|
||||||
|
|
|
@ -7,6 +7,8 @@ wlr_files += files(
|
||||||
'session/session.c',
|
'session/session.c',
|
||||||
'drm/backend.c',
|
'drm/backend.c',
|
||||||
'drm/drm.c',
|
'drm/drm.c',
|
||||||
|
'drm/drm-properties.c',
|
||||||
|
'drm/drm-util.c',
|
||||||
'libinput/backend.c',
|
'libinput/backend.c',
|
||||||
'libinput/events.c',
|
'libinput/events.c',
|
||||||
'libinput/keyboard.c',
|
'libinput/keyboard.c',
|
||||||
|
|
Loading…
Reference in New Issue