<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
</head><body bgcolor="#FFFFFF" text="#000000"><br>
This one looks fine to me. <br>
<br>
Reviewed-by: Todd Previte <a class="moz-txt-link-rfc2396E" href="mailto:tprevite@gmail.com"><tprevite@gmail.com></a><br>
<br>
<blockquote style="border: 0px none;"
cite="mid:1400640904-16847-7-git-send-email-airlied@gmail.com"
type="cite">
<div style="margin:30px 25px 10px 25px;" class="__pbConvHr"><div
style="display:table;width:100%;border-top:1px solid
#EDEEF0;padding-top:5px"> <div
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
photoaddress="airlied@gmail.com" photoname="Dave Airlie"
src="cid:part1.01030002.04010904@gmail.com" name="postbox-contact.jpg"
height="25px" width="25px"></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
<a moz-do-not-send="true" href="mailto:airlied@gmail.com"
style="color:#737F92
!important;padding-right:6px;font-weight:bold;text-decoration:none
!important;">Dave Airlie</a></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;">
<font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20,
2014 7:54 PM</span></font></div></div></div>
<div style="color:#888888;margin-left:24px;margin-right:24px;"
__pbrmquotes="true" class="__pbConvBody"><div>From: Dave Airlie
<a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br><br>This property will be used by the MST
code to provide userspace<br>with a path to parse so it can recognise
connectors around hotplugs.<br><br>Signed-off-by: Dave Airlie
<a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br>---<br> drivers/gpu/drm/drm_crtc.c | 26
++++++++++++++++++++++++++<br> include/drm/drm_crtc.h | 5 +++++<br>
2 files changed, 31 insertions(+)<br><br>diff --git
a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c<br>index
8bf87a6..06b9255 100644<br>--- a/drivers/gpu/drm/drm_crtc.c<br>+++
b/drivers/gpu/drm/drm_crtc.c<br>@@ -1165,6 +1165,7 @@ static int
drm_mode_create_standard_connector_properties(struct drm_device *dev)<br>
{<br> struct drm_property *edid;<br> struct drm_property *dpms;<br>+
struct drm_property *dev_path;<br> <br> /*<br> * Standard properties
(apply to all connectors)<br>@@ -1179,6 +1180,12 @@ static int
drm_mode_create_standard_connector_properties(struct drm_device *dev)<br>
ARRAY_SIZE(drm_dpms_enum_list));<br>
dev->mode_config.dpms_property = dpms;<br> <br>+ dev_path =
drm_property_create(dev,<br>+ DRM_MODE_PROP_BLOB |<br>+
DRM_MODE_PROP_IMMUTABLE,<br>+ "PATH", 0);<br>+
dev->mode_config.path_property = dev_path;<br>+<br> return 0;<br> }<br>
<br>@@ -3637,6 +3644,25 @@ done:<br> return ret;<br> }<br> <br>+int
drm_mode_connector_set_path_property(struct drm_connector *connector,<br>+
char *path)<br>+{<br>+ struct drm_device *dev = connector->dev;<br>+
int ret, size;<br>+ size = strlen(path) + 1;<br>+<br>+
connector->path_blob_ptr =
drm_property_create_blob(connector->dev,<br>+ size, path);<br>+
if (!connector->path_blob_ptr)<br>+ return -EINVAL;<br>+<br>+ ret =
drm_object_property_set_value(&connector->base,<br>+
dev->mode_config.path_property,<br>+
connector->path_blob_ptr->base.id);<br>+ return ret;<br>+}<br>+EXPORT_SYMBOL(drm_mode_connector_set_path_property);<br>+<br>
/**<br> * drm_mode_connector_update_edid_property - update the edid
property of a connector<br> * @connector: drm connector<br>diff --git
a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h<br>index
55bc523..e33959b 100644<br>--- a/include/drm/drm_crtc.h<br>+++
b/include/drm/drm_crtc.h<br>@@ -500,6 +500,8 @@ struct drm_connector {<br>
struct drm_property_blob *edid_blob_ptr;<br> struct
drm_object_properties properties;<br> <br>+ struct drm_property_blob
*path_blob_ptr;<br>+<br> uint8_t polled; /* DRM_CONNECTOR_POLL_* */<br>
<br> /* requested DPMS state */<br>@@ -774,6 +776,7 @@ struct
drm_mode_config {<br> struct list_head property_blob_list;<br> struct
drm_property *edid_property;<br> struct drm_property *dpms_property;<br>+
struct drm_property *path_property;<br> struct drm_property
*plane_type_property;<br> <br> /* DVI-I properties */<br>@@ -926,6
+929,8 @@ extern void drm_mode_config_init(struct drm_device *dev);<br>
extern void drm_mode_config_reset(struct drm_device *dev);<br> extern
void drm_mode_config_cleanup(struct drm_device *dev);<br> <br>+extern
int drm_mode_connector_set_path_property(struct drm_connector
*connector,<br>+ char *path);<br> extern int
drm_mode_connector_update_edid_property(struct drm_connector *connector,<br>
struct edid *edid);<br> extern int
drm_object_property_set_value(struct drm_mode_object *obj,<br></div></div>
<div style="margin:30px 25px 10px 25px;" class="__pbConvHr"><div
style="display:table;width:100%;border-top:1px solid
#EDEEF0;padding-top:5px"> <div
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
photoaddress="airlied@gmail.com" photoname="Dave Airlie"
src="cid:part1.01030002.04010904@gmail.com" name="postbox-contact.jpg"
height="25px" width="25px"></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
<a moz-do-not-send="true" href="mailto:airlied@gmail.com"
style="color:#737F92
!important;padding-right:6px;font-weight:bold;text-decoration:none
!important;">Dave Airlie</a></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;">
<font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20,
2014 7:54 PM</span></font></div></div></div>
<div style="color:#888888;margin-left:24px;margin-right:24px;"
__pbrmquotes="true" class="__pbConvBody"><div>Hey,<br><br>So this set is
pretty close to what I think we should be merging initially,<br><br>Since
the last set, it makes fbcon and suspend/resume work a lot better,<br><br>I've
also fixed a couple of bugs in -intel that make things work a lot<br>better.<br><br>I've
bashed on this a bit using kms-flip from intel-gpu-tools, hacked<br>to
add 3 monitor support.<br><br>It still generates a fair few i915 state
checker backtraces, and some<br>of them are fairly hard to work out, it
might be we should just tone<br>down the state checker for
encoders/connectors with no actual hw backing<br>them.<br><br>Dave.<br><br>_______________________________________________<br>Intel-gfx
mailing list<br><a class="moz-txt-link-abbreviated" href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br><a class="moz-txt-link-freetext" href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br></div></div>
</blockquote>
<br>
<div class="moz-signature">-- <br>
<div><font size="-1">Sent using Postbox:<br><a
href="http://www.getpostbox.com"><span style="color: rgb(51, 102, 153);">http://www.getpostbox.com</span></a></font></div></div>
</body></html>