* [PATCH] drm/i915: Update atomic state when removing mst connector.
@ 2015-07-21 7:56 Maarten Lankhorst
2015-07-21 9:09 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Maarten Lankhorst @ 2015-07-21 7:56 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp_mst.c | 44 ++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index edd8fa41e85e..fb4f2715c96f 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -449,6 +449,48 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
return connector;
}
+static void intel_dp_unbind_mst_connector(struct drm_device *dev,
+ struct drm_connector *connector)
+{
+ struct drm_atomic_state *state;
+ struct drm_connector_state *conn_state;
+ struct drm_crtc *crtc = connector->state->crtc;
+ int ret;
+
+ if (!crtc)
+ return;
+
+ state = drm_atomic_state_alloc(dev);
+ if (!state)
+ return;
+
+ state->acquire_ctx = dev->mode_config.acquire_ctx;
+
+ conn_state = drm_atomic_get_connector_state(state, connector);
+ ret = PTR_ERR_OR_ZERO(conn_state);
+ if (!ret)
+ ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
+
+ if (!ret)
+ ret = drm_atomic_add_affected_connectors(state, crtc);
+
+ if (!ret && !drm_atomic_connectors_for_crtc(state, crtc)) {
+ struct drm_crtc_state *crtc_state =
+ drm_atomic_get_existing_crtc_state(state, crtc);
+
+ crtc_state->active = false;
+ ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
+ }
+
+ if (!ret)
+ ret = drm_atomic_commit(state);
+
+ if (ret)
+ drm_atomic_state_free(state);
+
+ I915_STATE_WARN_ON(ret);
+}
+
static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
struct drm_connector *connector)
{
@@ -456,7 +498,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
struct drm_device *dev = connector->dev;
drm_modeset_lock_all(dev);
- drm_atomic_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
+ intel_dp_unbind_mst_connector(dev, connector);
drm_modeset_unlock_all(dev);
intel_connector->unregister(intel_connector);
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Update atomic state when removing mst connector.
2015-07-21 7:56 [PATCH] drm/i915: Update atomic state when removing mst connector Maarten Lankhorst
@ 2015-07-21 9:09 ` Daniel Vetter
2015-07-21 9:23 ` Maarten Lankhorst
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2015-07-21 9:09 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
On Tue, Jul 21, 2015 at 09:56:15AM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp_mst.c | 44 ++++++++++++++++++++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index edd8fa41e85e..fb4f2715c96f 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -449,6 +449,48 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> return connector;
> }
>
> +static void intel_dp_unbind_mst_connector(struct drm_device *dev,
> + struct drm_connector *connector)
> +{
> + struct drm_atomic_state *state;
> + struct drm_connector_state *conn_state;
> + struct drm_crtc *crtc = connector->state->crtc;
> + int ret;
> +
> + if (!crtc)
> + return;
> +
> + state = drm_atomic_state_alloc(dev);
> + if (!state)
> + return;
> +
> + state->acquire_ctx = dev->mode_config.acquire_ctx;
> +
> + conn_state = drm_atomic_get_connector_state(state, connector);
> + ret = PTR_ERR_OR_ZERO(conn_state);
> + if (!ret)
> + ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
> +
> + if (!ret)
> + ret = drm_atomic_add_affected_connectors(state, crtc);
> +
> + if (!ret && !drm_atomic_connectors_for_crtc(state, crtc)) {
> + struct drm_crtc_state *crtc_state =
> + drm_atomic_get_existing_crtc_state(state, crtc);
> +
> + crtc_state->active = false;
The connector will completely disappear, and we don't support cloning.
Which means there's still going to be state check failures. I think we
need a
crtc_state->enable = false;
here, plus cleaning out the connector_state->crtc link.
-Daniel
> + ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
> + }
> +
> + if (!ret)
> + ret = drm_atomic_commit(state);
> +
> + if (ret)
> + drm_atomic_state_free(state);
> +
> + I915_STATE_WARN_ON(ret);
> +}
> +
> static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_connector *connector)
> {
> @@ -456,7 +498,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_device *dev = connector->dev;
>
> drm_modeset_lock_all(dev);
> - drm_atomic_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
> + intel_dp_unbind_mst_connector(dev, connector);
> drm_modeset_unlock_all(dev);
>
> intel_connector->unregister(intel_connector);
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Update atomic state when removing mst connector.
2015-07-21 9:09 ` Daniel Vetter
@ 2015-07-21 9:23 ` Maarten Lankhorst
0 siblings, 0 replies; 3+ messages in thread
From: Maarten Lankhorst @ 2015-07-21 9:23 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
Op 21-07-15 om 11:09 schreef Daniel Vetter:
> On Tue, Jul 21, 2015 at 09:56:15AM +0200, Maarten Lankhorst wrote:
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_dp_mst.c | 44 ++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 43 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
>> index edd8fa41e85e..fb4f2715c96f 100644
>> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
>> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
>> @@ -449,6 +449,48 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>> return connector;
>> }
>>
>> +static void intel_dp_unbind_mst_connector(struct drm_device *dev,
>> + struct drm_connector *connector)
>> +{
>> + struct drm_atomic_state *state;
>> + struct drm_connector_state *conn_state;
>> + struct drm_crtc *crtc = connector->state->crtc;
>> + int ret;
>> +
>> + if (!crtc)
>> + return;
>> +
>> + state = drm_atomic_state_alloc(dev);
>> + if (!state)
>> + return;
>> +
>> + state->acquire_ctx = dev->mode_config.acquire_ctx;
>> +
>> + conn_state = drm_atomic_get_connector_state(state, connector);
>> + ret = PTR_ERR_OR_ZERO(conn_state);
>> + if (!ret)
>> + ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
^^
>> + if (!ret)
>> + ret = drm_atomic_add_affected_connectors(state, crtc);
>> +
>> + if (!ret && !drm_atomic_connectors_for_crtc(state, crtc)) {
>> + struct drm_crtc_state *crtc_state =
>> + drm_atomic_get_existing_crtc_state(state, crtc);
>> +
>> + crtc_state->active = false;
> The connector will completely disappear, and we don't support cloning.
> Which means there's still going to be state check failures. I think we
> need a
> crtc_state->enable = false;
Done below.
> here, plus cleaning out the connector_state->crtc link.
Done above.
> -Daniel
>
>> + ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
^^
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-21 9:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-21 7:56 [PATCH] drm/i915: Update atomic state when removing mst connector Maarten Lankhorst
2015-07-21 9:09 ` Daniel Vetter
2015-07-21 9:23 ` Maarten Lankhorst
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox