From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 4/5] drm/atomic: Do not unset crtc when an encoder is stolen
Date: Thu, 7 Jan 2016 10:59:21 +0100 [thread overview]
Message-ID: <1452160762-30487-5-git-send-email-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <1452160762-30487-1-git-send-email-maarten.lankhorst@linux.intel.com>
While we steal the encoder away from the connector the connector may
be updated to use a different encoder.
Without this change if 2 connectors swap encoders one of them will
end up without a crtc.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 57cccd68ca52..9c84b3b37631 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -134,7 +134,6 @@ steal_encoder(struct drm_atomic_state *state,
struct drm_crtc_state *crtc_state;
struct drm_connector *connector;
struct drm_connector_state *connector_state;
- int ret;
/*
* We can only steal an encoder coming from a connector, which means we
@@ -165,9 +164,6 @@ steal_encoder(struct drm_atomic_state *state,
if (IS_ERR(connector_state))
return PTR_ERR(connector_state);
- ret = drm_atomic_set_crtc_for_connector(connector_state, NULL);
- if (ret)
- return ret;
connector_state->best_encoder = NULL;
}
--
2.1.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-01-07 9:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 9:59 [PATCH 0/5] Add encoder_mask to crtc_state, v2 Maarten Lankhorst
2016-01-07 9:59 ` [PATCH 1/5] drm/core: Add drm_encoder_index Maarten Lankhorst
2016-02-03 12:43 ` [Intel-gfx] " Gustavo Padovan
2016-01-07 9:59 ` [PATCH 2/5] drm/core: Add drm_for_each_encoder_mask, v2 Maarten Lankhorst
2016-02-03 12:43 ` Gustavo Padovan
2016-01-07 9:59 ` [PATCH 3/5] drm/i915: Do not touch best_encoder for load detect Maarten Lankhorst
2016-02-03 12:44 ` Gustavo Padovan
2016-01-07 9:59 ` Maarten Lankhorst [this message]
2016-02-03 12:44 ` [PATCH 4/5] drm/atomic: Do not unset crtc when an encoder is stolen Gustavo Padovan
2016-01-07 9:59 ` [PATCH 5/5] drm/atomic: Add encoder_mask to crtc_state, v2 Maarten Lankhorst
2016-01-28 13:57 ` Maarten Lankhorst
2016-01-28 14:04 ` [PATCH v3 5/5] drm/atomic: Add encoder_mask to crtc_state, v3 Maarten Lankhorst
2016-02-03 12:45 ` Gustavo Padovan
2016-02-09 8:52 ` Daniel Vetter
2016-01-11 8:52 ` ✗ warning: Fi.CI.BAT Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452160762-30487-5-git-send-email-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.