Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add TILE property support (for MST tiled monitors) 

Based on the patch for modesetting (and lots of work) by Dave Airlie

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-03-31 09:59:58 +01:00
parent 8dc716e866
commit 1be5b71582
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/sna/sna_display.c
View File

@ -3185,6 +3185,47 @@ done:
}
}
static void
sna_output_attach_tile(xf86OutputPtr output)
{
#if XF86_OUTPUT_VERSION >= 3
struct sna *sna = to_sna(output->scrn);
struct sna_output *sna_output = output->driver_private;
struct drm_mode_get_blob blob;
struct xf86CrtcTileInfo tile_info, *set = NULL;
char *tile;
int id;
id = find_property(sna, sna_output, "TILE");
DBG(("%s: found? TILE=%d\n", __FUNCTION__, id));
if (id == -1)
goto out;
VG_CLEAR(blob);
blob.blob_id = sna_output->prop_values[id];
blob.length = 0;
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
goto out;
do {
id = blob.length;
tile = alloca(id + 1);
blob.data = (uintptr_t)tile;
VG(memset(tile, 0, id));
DBG(("%s: reading %d bytes for TILE blob\n", __FUNCTION__, id));
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
goto out;
} while (id != blob.length);
tile[blob.length] = '\0'; /* paranoia */
DBG(("%s: TILE='%s'\n", __FUNCTION__, tile));
if (xf86OutputParseKMSTile(tile, blob.length, &tile_info))
set = &tile_info;
out:
xf86OutputSetTile(output, set);
#endif
}
static bool duplicate_mode(DisplayModePtr modes, DisplayModePtr m)
{
if (m == NULL)
@ -3281,6 +3322,7 @@ sna_output_get_modes(xf86OutputPtr output)
assert(sna_output->id);
sna_output_attach_edid(output);
sna_output_attach_tile(output);
if (output->crtc) {
struct drm_mode_crtc mode;

43
src/uxa/intel_display.c
View File

@ -868,6 +868,48 @@ intel_output_attach_edid(xf86OutputPtr output)
xf86OutputSetEDID(output, mon);
}
static void
intel_output_attach_tile(xf86OutputPtr output)
{
#if XF86_OUTPUT_VERSION >= 3
struct intel_output *intel_output = output->driver_private;
drmModeConnectorPtr koutput = intel_output->mode_output;
struct intel_mode *mode = intel_output->mode;
drmModePropertyBlobPtr blob = NULL;
struct xf86CrtcTileInfo tile_info, *set = NULL;
int i;
for (i = 0; koutput && i < koutput->count_props; i++) {
drmModePropertyPtr props;
props = drmModeGetProperty(mode->fd, koutput->props[i]);
if (!props)
continue;
if (!(props->flags & DRM_MODE_PROP_BLOB)) {
drmModeFreeProperty(props);
continue;
}
if (!strcmp(props->name, "TILE")) {
blob = drmModeGetPropertyBlob(mode->fd,
koutput->prop_values[i]);
}
drmModeFreeProperty(props);
}
if (blob) {
if (xf86OutputParseKMSTile(blob->data,
blob->length,
&tile_info))
set = &tile_info;
drmModeFreePropertyBlob(blob);
}
xf86OutputSetTile(output, set);
#endif
}
static DisplayModePtr
intel_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
{
@ -923,6 +965,7 @@ intel_output_get_modes(xf86OutputPtr output)
int i;
intel_output_attach_edid(output);
intel_output_attach_tile(output);
if (!koutput)
return Modes;