[xorg-x11-drv-intel/f20] add UXA MST support
Dave Airlie
airlied at fedoraproject.org
Wed Sep 3 03:22:56 UTC 2014
commit b3287fd2f2a213dde2e0ee68d8ab5c7d75f83ebc
Author: Dave Airlie <airlied at redhat.com>
Date: Fri May 23 14:08:51 2014 +1000
add UXA MST support
uxa-mst.patch | 613 +++++++++++++++++++++++++++++++++++++++++++++++
xorg-x11-drv-intel.spec | 8 +-
2 files changed, 620 insertions(+), 1 deletions(-)
---
diff --git a/uxa-mst.patch b/uxa-mst.patch
new file mode 100644
index 0000000..5c161c1
--- /dev/null
+++ b/uxa-mst.patch
@@ -0,0 +1,613 @@
+diff -up xf86-video-intel-2.21.15/src/intel_options.c.mst xf86-video-intel-2.21.15/src/intel_options.c
+--- xf86-video-intel-2.21.15/src/intel_options.c.mst 2013-07-04 06:42:09.000000000 +1000
++++ xf86-video-intel-2.21.15/src/intel_options.c 2014-08-15 12:52:19.238859360 +1000
+@@ -18,6 +18,7 @@ const OptionInfoRec intel_options[] = {
+ {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, 0},
+ {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, 1},
+ {OPTION_REPROBE, "ReprobeOutputs", OPTV_BOOLEAN, {0}, 0},
++ {OPTION_DELETE_DP12, "DeleteUnusedDP12Displays", OPTV_BOOLEAN, {0}, FALSE },
+ #ifdef INTEL_XVMC
+ {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, 1},
+ #endif
+diff -up xf86-video-intel-2.21.15/src/intel_options.h.mst xf86-video-intel-2.21.15/src/intel_options.h
+--- xf86-video-intel-2.21.15/src/intel_options.h.mst 2013-07-04 06:42:09.000000000 +1000
++++ xf86-video-intel-2.21.15/src/intel_options.h 2014-08-15 12:52:19.238859360 +1000
+@@ -24,6 +24,7 @@ enum intel_options {
+ OPTION_PREFER_OVERLAY,
+ OPTION_HOTPLUG,
+ OPTION_REPROBE,
++ OPTION_DELETE_DP12,
+ #if defined(XvMCExtension) && defined(ENABLE_XVMC)
+ OPTION_XVMC,
+ #define INTEL_XVMC 1
+diff -up xf86-video-intel-2.21.15/src/uxa/intel_display.c.mst xf86-video-intel-2.21.15/src/uxa/intel_display.c
+--- xf86-video-intel-2.21.15/src/uxa/intel_display.c.mst 2014-08-15 12:52:19.236859373 +1000
++++ xf86-video-intel-2.21.15/src/uxa/intel_display.c 2014-08-15 12:52:19.239859353 +1000
+@@ -58,7 +58,6 @@
+ struct intel_mode {
+ int fd;
+ uint32_t fb_id;
+- drmModeResPtr mode_res;
+ int cpp;
+
+ drmEventContext event_context;
+@@ -71,6 +70,7 @@ struct intel_mode {
+
+ struct list outputs;
+ struct list crtcs;
++ Bool delete_dp_12_displays;
+ };
+
+ struct intel_pageflip {
+@@ -104,7 +104,7 @@ struct intel_output {
+ struct intel_mode *mode;
+ int output_id;
+ drmModeConnectorPtr mode_output;
+- drmModeEncoderPtr mode_encoder;
++ drmModeEncoderPtr *mode_encoders;
+ drmModePropertyBlobPtr edid_blob;
+ int num_props;
+ struct intel_property *props;
+@@ -120,6 +120,8 @@ struct intel_output {
+ int backlight_max;
+ xf86OutputPtr output;
+ struct list link;
++ int enc_mask;
++ int enc_clone_mask;
+ };
+
+ static void
+@@ -476,6 +478,8 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+ continue;
+
+ intel_output = output->driver_private;
++ if (!intel_output->mode_output)
++ return FALSE;
+ output_ids[output_count] =
+ intel_output->mode_output->connector_id;
+ output_count++;
+@@ -829,7 +833,7 @@ static const xf86CrtcFuncsRec intel_crtc
+ };
+
+ static void
+-intel_crtc_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num)
++intel_crtc_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_res, int num)
+ {
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ xf86CrtcPtr crtc;
+@@ -846,7 +850,7 @@ intel_crtc_init(ScrnInfoPtr scrn, struct
+ }
+
+ intel_crtc->mode_crtc = drmModeGetCrtc(mode->fd,
+- mode->mode_res->crtcs[num]);
++ mode_res->crtcs[num]);
+ if (intel_crtc->mode_crtc == NULL) {
+ free(intel_crtc);
+ return;
+@@ -932,6 +936,10 @@ intel_output_attach_edid(xf86OutputPtr o
+ xf86MonPtr mon = NULL;
+ int i;
+
++ if (!koutput) {
++ xf86OutputSetEDID(output, mon);
++ return;
++ }
+ /* look for an EDID property */
+ for (i = 0; i < koutput->count_props; i++) {
+ drmModePropertyPtr props;
+@@ -1021,6 +1029,9 @@ intel_output_get_modes(xf86OutputPtr out
+
+ intel_output_attach_edid(output);
+
++ if (!koutput)
++ return Modes;
++
+ /* modes should already be available */
+ for (i = 0; i < koutput->count_modes; i++) {
+ DisplayModePtr Mode;
+@@ -1073,7 +1084,10 @@ intel_output_destroy(xf86OutputPtr outpu
+ free(intel_output->props[i].atoms);
+ }
+ free(intel_output->props);
+-
++ for (i = 0; i < intel_output->mode_output->count_encoders; i++) {
++ drmModeFreeEncoder(intel_output->mode_encoders[i]);
++ }
++ free(intel_output->mode_encoders);
+ drmModeFreeConnector(intel_output->mode_output);
+ intel_output->mode_output = NULL;
+
+@@ -1112,6 +1126,9 @@ intel_output_dpms(xf86OutputPtr output,
+ struct intel_mode *mode = intel_output->mode;
+ int i;
+
++ if (!koutput)
++ return;
++
+ for (i = 0; i < koutput->count_props; i++) {
+ drmModePropertyPtr props;
+
+@@ -1458,52 +1475,158 @@ static const char *output_names[] = {
+ "TV",
+ "eDP",
+ };
++static xf86OutputPtr find_output(ScrnInfoPtr pScrn, int id)
++{
++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
++ int i;
++ for (i = 0; i < xf86_config->num_output; i++) {
++ xf86OutputPtr output = xf86_config->output[i];
++ struct intel_output *intel_output;
++
++ intel_output = output->driver_private;
++ if (intel_output->output_id == id)
++ return output;
++ }
++ return NULL;
++}
++
++static int parse_path_blob(drmModePropertyBlobPtr path_blob, int *conn_base_id, char **path)
++{
++ char *conn;
++ char conn_id[5];
++ int id, len;
++ char *blob_data;
++
++ if (!path_blob)
++ return -1;
++
++ blob_data = path_blob->data;
++ /* we only handle MST paths for now */
++ if (strncmp(blob_data, "mst:", 4))
++ return -1;
++
++ conn = strchr(blob_data + 4, '-');
++ if (!conn)
++ return -1;
++ len = conn - (blob_data + 4);
++ if (len + 1 > 5)
++ return -1;
++ memcpy(conn_id, blob_data + 4, len);
++ conn_id[len] = '\0';
++ id = strtoul(conn_id, NULL, 10);
++
++ *conn_base_id = id;
++
++ *path = conn + 1;
++ return 0;
++}
++
++static void
++drmmode_create_name(ScrnInfoPtr pScrn, drmModeConnectorPtr koutput, char *name,
++ drmModePropertyBlobPtr path_blob)
++{
++ int ret;
++ char *extra_path;
++ int conn_id;
++ xf86OutputPtr output;
++
++ ret = parse_path_blob(path_blob, &conn_id, &extra_path);
++ if (ret == -1)
++ goto fallback;
++
++ output = find_output(pScrn, conn_id);
++ if (!output)
++ goto fallback;
++
++ snprintf(name, 32, "%s-%s", output->name, extra_path);
++ ErrorF("setting name to %s\n", name);
++ return;
++
++fallback:
++ if (koutput->connector_type >= ARRAY_SIZE(output_names))
++ snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
++#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
++ else if (pScrn->is_gpu)
++ snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id - 1);
++#endif
++ else
++ snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
++}
+
+ static void
+-intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num)
++intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_res, int num, int dynamic)
+ {
++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ xf86OutputPtr output;
+ drmModeConnectorPtr koutput;
+- drmModeEncoderPtr kencoder;
++ drmModeEncoderPtr *kencoders = NULL;
+ struct intel_output *intel_output;
+- const char *output_name;
+ char name[32];
++ drmModePropertyPtr props;
++ drmModePropertyBlobPtr path_blob = NULL;
++ int i;
+
+ koutput = drmModeGetConnector(mode->fd,
+- mode->mode_res->connectors[num]);
++ mode_res->connectors[num]);
+ if (!koutput)
+ return;
++ for (i = 0; i < koutput->count_props; i++) {
++ props = drmModeGetProperty(mode->fd, koutput->props[i]);
++ if (props && (props->flags & DRM_MODE_PROP_BLOB)) {
++ if (!strcmp(props->name, "PATH")) {
++ path_blob = drmModeGetPropertyBlob(mode->fd, koutput->prop_values[i]);
+
+- kencoder = drmModeGetEncoder(mode->fd, koutput->encoders[0]);
+- if (!kencoder) {
+- drmModeFreeConnector(koutput);
+- return;
++ drmModeFreeProperty(props);
++ break;
++ }
++ drmModeFreeProperty(props);
++ }
+ }
+
+- if (koutput->connector_type < ARRAY_SIZE(output_names))
+- output_name = output_names[koutput->connector_type];
+- else
+- output_name = "UNKNOWN";
+- snprintf(name, 32, "%s%d", output_name, koutput->connector_type_id);
++ drmmode_create_name(scrn, koutput, name, path_blob);
++ if (path_blob)
++ drmModeFreePropertyBlob(path_blob);
++
++ if (path_blob && dynamic) {
++ /* see if we have an output with this name already
++ and hook stuff up */
++ for (i = 0; i < xf86_config->num_output; i++) {
++ output = xf86_config->output[i];
++
++ if (strncmp(output->name, name, 32))
++ continue;
++
++ intel_output = output->driver_private;
++ intel_output->output_id = mode_res->connectors[num];
++ intel_output->mode_output = koutput;
++ return;
++ }
++ }
++ kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
++ if (!kencoders) {
++ goto out_free_encoders;
++ }
++
++ for (i = 0; i < koutput->count_encoders; i++) {
++ kencoders[i] = drmModeGetEncoder(mode->fd, koutput->encoders[i]);
++ if (!kencoders[i])
++ goto out_free_encoders;
++ }
+
+ output = xf86OutputCreate (scrn, &intel_output_funcs, name);
+ if (!output) {
+- drmModeFreeEncoder(kencoder);
+- drmModeFreeConnector(koutput);
+- return;
++ goto out_free_encoders;
+ }
+
+ intel_output = calloc(sizeof(struct intel_output), 1);
+ if (!intel_output) {
+ xf86OutputDestroy(output);
+- drmModeFreeConnector(koutput);
+- drmModeFreeEncoder(kencoder);
+- return;
++ goto out_free_encoders;
+ }
+
+- intel_output->output_id = mode->mode_res->connectors[num];
++ intel_output->output_id = mode_res->connectors[num];
+ intel_output->mode_output = koutput;
+- intel_output->mode_encoder = kencoder;
++ intel_output->mode_encoders = kencoders;
+ intel_output->mode = mode;
+
+ output->mm_width = koutput->mmWidth;
+@@ -1515,11 +1638,22 @@ intel_output_init(ScrnInfoPtr scrn, stru
+ if (is_panel(koutput->connector_type))
+ intel_output_backlight_init(output);
+
+- output->possible_crtcs = kencoder->possible_crtcs;
++ output->possible_crtcs = 0x7f;
++ for (i = 0; i < koutput->count_encoders; i++) {
++ output->possible_crtcs &= kencoders[i]->possible_crtcs;
++ }
+ output->interlaceAllowed = TRUE;
+
+ intel_output->output = output;
+ list_add(&intel_output->link, &mode->outputs);
++ return;
++out_free_encoders:
++ if (kencoders) {
++ for (i = 0; i < koutput->count_encoders; i++)
++ drmModeFreeEncoder(kencoders[i]);
++ free(kencoders);
++ }
++ drmModeFreeConnector(koutput);
+ }
+
+ static Bool
+@@ -1762,57 +1896,63 @@ drm_wakeup_handler(pointer data, int err
+ drmHandleEvent(mode->fd, &mode->event_context);
+ }
+
+-static drmModeEncoderPtr
+-intel_get_kencoder(struct intel_mode *mode, int num)
+-{
+- struct intel_output *iterator;
+- int id = mode->mode_res->encoders[num];
+-
+- list_for_each_entry(iterator, &mode->outputs, link)
+- if (iterator->mode_encoder->encoder_id == id)
+- return iterator->mode_encoder;
+-
+- return NULL;
+-}
+-
+ /*
+ * Libdrm's possible_clones is a mask of encoders, Xorg's possible_clones is a
+ * mask of outputs. This function sets Xorg's possible_clones based on the
+ * values read from libdrm.
+ */
+-static void
+-intel_compute_possible_clones(ScrnInfoPtr scrn, struct intel_mode *mode)
++static uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
+ {
+- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+- struct intel_output *intel_output, *clone;
+- drmModeEncoderPtr cloned_encoder;
+- uint32_t mask;
+- int i, j, k;
+- CARD32 possible_clones;
++ struct intel_output *intel_output = output->driver_private, *clone_drmout;
++ int i;
++ xf86OutputPtr clone_output;
++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
++ int index_mask = 0;
+
+- for (i = 0; i < config->num_output; i++) {
+- possible_clones = 0;
+- intel_output = config->output[i]->driver_private;
++ if (intel_output->enc_clone_mask == 0)
++ return index_mask;
+
+- mask = intel_output->mode_encoder->possible_clones;
+- for (j = 0; mask != 0; j++, mask >>= 1) {
++ for (i = 0; i < xf86_config->num_output; i++) {
++ clone_output = xf86_config->output[i];
++ clone_drmout = clone_output->driver_private;
++ if (output == clone_output)
++ continue;
+
+- if ((mask & 1) == 0)
+- continue;
++ if (clone_drmout->enc_mask == 0)
++ continue;
++ if (intel_output->enc_clone_mask == clone_drmout->enc_mask)
++ index_mask |= (1 << i);
++ }
++ return index_mask;
++}
++static void
++intel_compute_possible_clones(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_res)
++{
++ int i, j;
++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+- cloned_encoder = intel_get_kencoder(mode, j);
+- if (!cloned_encoder)
+- continue;
++ for (i = 0; i < xf86_config->num_output; i++) {
++ xf86OutputPtr output = xf86_config->output[i];
++ struct intel_output *intel_output;
+
+- for (k = 0; k < config->num_output; k++) {
+- clone = config->output[k]->driver_private;
+- if (clone->mode_encoder->encoder_id ==
+- cloned_encoder->encoder_id)
+- possible_clones |= (1 << k);
++ intel_output = output->driver_private;
++ intel_output->enc_clone_mask = 0xff;
++ /* and all the possible encoder clones for this output together */
++ for (j = 0; j < intel_output->mode_output->count_encoders; j++)
++ {
++ int k;
++ for (k = 0; k < mode_res->count_encoders; k++) {
++ if (mode_res->encoders[k] == intel_output->mode_encoders[j]->encoder_id)
++ intel_output->enc_mask |= (1 << k);
+ }
++
++ intel_output->enc_clone_mask &= intel_output->mode_encoders[j]->possible_clones;
+ }
++ }
+
+- config->output[i]->possible_clones = possible_clones;
++ for (i = 0; i < xf86_config->num_output; i++) {
++ xf86OutputPtr output = xf86_config->output[i];
++ output->possible_clones = find_clones(scrn, output);
+ }
+ }
+
+@@ -1823,6 +1963,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scr
+ struct intel_mode *mode;
+ unsigned int i;
+ int has_flipping;
++ drmModeResPtr mode_res;
+
+ mode = calloc(1, sizeof *mode);
+ if (!mode)
+@@ -1836,23 +1977,23 @@ Bool intel_mode_pre_init(ScrnInfoPtr scr
+ xf86CrtcConfigInit(scrn, &intel_xf86crtc_config_funcs);
+
+ mode->cpp = cpp;
+- mode->mode_res = drmModeGetResources(mode->fd);
+- if (!mode->mode_res) {
++ mode_res = drmModeGetResources(mode->fd);
++ if (!mode_res) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "failed to get resources: %s\n", strerror(errno));
+ free(mode);
+ return FALSE;
+ }
+
+- xf86CrtcSetSizeRange(scrn, 320, 200, mode->mode_res->max_width,
+- mode->mode_res->max_height);
+- for (i = 0; i < mode->mode_res->count_crtcs; i++)
+- intel_crtc_init(scrn, mode, i);
++ xf86CrtcSetSizeRange(scrn, 320, 200, mode_res->max_width,
++ mode_res->max_height);
++ for (i = 0; i < mode_res->count_crtcs; i++)
++ intel_crtc_init(scrn, mode, mode_res, i);
+
+- for (i = 0; i < mode->mode_res->count_connectors; i++)
+- intel_output_init(scrn, mode, i);
++ for (i = 0; i < mode_res->count_connectors; i++)
++ intel_output_init(scrn, mode, mode_res, i, 0);
+
+- intel_compute_possible_clones(scrn, mode);
++ intel_compute_possible_clones(scrn, mode, mode_res);
+
+ #ifdef INTEL_PIXMAP_SHARING
+ xf86ProviderSetup(scrn, NULL, "Intel");
+@@ -1875,7 +2016,12 @@ Bool intel_mode_pre_init(ScrnInfoPtr scr
+ intel->use_pageflipping = TRUE;
+ }
+
++ if (xf86ReturnOptValBool(intel->Options, OPTION_DELETE_DP12, FALSE)) {
++ mode->delete_dp_12_displays = TRUE;
++ }
++
+ intel->modes = mode;
++ drmModeFreeResources(mode_res);
+ return TRUE;
+ }
+
+@@ -2134,3 +2280,79 @@ cleanup_dst:
+ cleanup_src:
+ (*pScreen->DestroyPixmap)(src);
+ }
++
++void
++intel_mode_hotplug(struct intel_screen_private *intel)
++{
++ ScrnInfoPtr scrn = intel->scrn;
++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
++ drmModeResPtr mode_res;
++ int i, j;
++ Bool found;
++ Bool changed = FALSE;
++ struct intel_mode *mode = intel->modes;
++ mode_res = drmModeGetResources(intel->drmSubFD);
++ if (!mode_res)
++ goto out;
++
++restart_destroy:
++ for (i = 0; i < config->num_output; i++) {
++ xf86OutputPtr output = config->output[i];
++ struct intel_output *intel_output;
++
++ intel_output = output->driver_private;
++ found = FALSE;
++ for (j = 0; j < mode_res->count_connectors; j++) {
++ if (mode_res->connectors[j] == intel_output->output_id) {
++ found = TRUE;
++ break;
++ }
++ }
++ if (found)
++ continue;
++
++ drmModeFreeConnector(intel_output->mode_output);
++ intel_output->mode_output = NULL;
++ intel_output->output_id = -1;
++
++ changed = TRUE;
++ if (mode->delete_dp_12_displays) {
++ ErrorF("destroying id %d\n", intel_output->output_id);
++ RROutputDestroy(output->randr_output);
++ xf86OutputDestroy(output);
++ goto restart_destroy;
++ }
++ }
++
++ /* find new output ids we don't have outputs for */
++ for (i = 0; i < mode_res->count_connectors; i++) {
++ found = FALSE;
++
++ for (j = 0; j < config->num_output; j++) {
++ xf86OutputPtr output = config->output[j];
++ struct intel_output *intel_output;
++
++ intel_output = output->driver_private;
++ if (mode_res->connectors[i] == intel_output->output_id) {
++ found = TRUE;
++ break;
++ }
++ }
++ if (found)
++ continue;
++
++ changed = TRUE;
++ ErrorF("adding id %d\n", mode_res->connectors[i]);
++ intel_output_init(scrn, intel->modes, mode_res, i, 1);
++
++ }
++
++ if (changed) {
++ RRSetChanged(xf86ScrnToScreen(scrn));
++ RRTellChanged(xf86ScrnToScreen(scrn));
++ }
++
++ drmModeFreeResources(mode_res);
++out:
++ RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
++}
+diff -up xf86-video-intel-2.21.15/src/uxa/intel_dri.c.mst xf86-video-intel-2.21.15/src/uxa/intel_dri.c
+--- xf86-video-intel-2.21.15/src/uxa/intel_dri.c.mst 2014-08-15 12:52:19.221859471 +1000
++++ xf86-video-intel-2.21.15/src/uxa/intel_dri.c 2014-08-15 12:52:19.240859347 +1000
+@@ -1356,6 +1356,7 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64
+
+ /* Drawable not displayed, make up a *monotonic* value */
+ if (pipe == -1) {
++fail:
+ *ust = gettime_us();
+ *msc = 0;
+ return TRUE;
+@@ -1374,7 +1375,7 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64
+ strerror(errno));
+ limit--;
+ }
+- return FALSE;
++ goto fail;
+ }
+
+ *ust = ((CARD64)vbl.reply.tval_sec * 1000000) + vbl.reply.tval_usec;
+diff -up xf86-video-intel-2.21.15/src/uxa/intel_driver.c.mst xf86-video-intel-2.21.15/src/uxa/intel_driver.c
+--- xf86-video-intel-2.21.15/src/uxa/intel_driver.c.mst 2014-08-15 12:52:19.227859432 +1000
++++ xf86-video-intel-2.21.15/src/uxa/intel_driver.c 2014-08-15 12:52:19.240859347 +1000
+@@ -900,7 +900,9 @@ I830HandleUEvents(int fd, void *closure)
+
+ if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
+ hotplug && atoi(hotplug) == 1)
+- RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
++ {
++ intel_mode_hotplug(intel);
++ }
+
+ udev_device_unref(dev);
+ }
+diff -up xf86-video-intel-2.21.15/src/uxa/intel.h.mst xf86-video-intel-2.21.15/src/uxa/intel.h
+--- xf86-video-intel-2.21.15/src/uxa/intel.h.mst 2014-08-15 12:54:39.218946920 +1000
++++ xf86-video-intel-2.21.15/src/uxa/intel.h 2014-08-15 12:54:48.791888500 +1000
+@@ -395,6 +395,7 @@ extern void intel_mode_disable_unused_fu
+ extern void intel_mode_remove_fb(intel_screen_private *intel);
+ extern void intel_mode_close(intel_screen_private *intel);
+ extern void intel_mode_fini(intel_screen_private *intel);
++extern void intel_mode_hotplug(intel_screen_private *intel);
+
+ extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
+ extern int intel_crtc_id(xf86CrtcPtr crtc);
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 9361389..9ef0240 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -25,7 +25,7 @@
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.21.15
-Release: 7%{?gitrev}%{?dist}
+Release: 8%{?gitrev}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -49,6 +49,8 @@ Patch5: intel-fix-pending-flip-count.patch
Patch6: intel-backlight-off-after-plugging-external-monitor.patch
Patch7: intel-when-the-backlight-is-off-report-cached-value.patch
+Patch10: uxa-mst.patch
+
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
@@ -101,6 +103,7 @@ Debugging tools for Intel graphics chips
%patch6 -p1
%patch7 -p1
+%patch10 -p1 -b .mst
%build
#export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer"
@@ -172,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Wed Sep 03 2014 Dave Airlie <airlied at redhat.com> 2.21.15-8
+- add UXA MST support
+
* Wed Jun 18 2014 Hans de Goede <hdegoede at redhat.com> - 2.21.15-7
- Fix laptop lcd backlight being turned off when an external monitor is
used and/or after a suspend-resume (rhbz#1032978, rhbz#1103806)
More information about the scm-commits
mailing list