From: Durgadoss R <durgadoss.r@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: ander.conselvan.de.oliveira@intel.com
Subject: [PATCHv2 3/4] drm/i915/dp: Use legacy get_crtc_encoder in non-atomic paths
Date: Mon, 1 Feb 2016 19:27:52 +0530 [thread overview]
Message-ID: <1454335073-20405-4-git-send-email-durgadoss.r@intel.com> (raw)
In-Reply-To: <1454335073-20405-1-git-send-email-durgadoss.r@intel.com>
This patch makes intel_crtc_get_new_crtc_encoder use get_crtc_encoder
when called from non-atomic paths. This helps when intel_get_shared_dpll
is called from non-atomic context.
Signed-off-by: Durgadoss R <durgadoss.r@intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 1f9a368..3fb9a03 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -707,6 +707,9 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state)
int i;
state = crtc_state->base.state;
+ /* Use get_crtc_encoder() for non-atomic paths */
+ if (!state)
+ return intel_ddi_get_crtc_encoder(crtc_state->base.crtc);
for_each_connector_in_state(state, connector, connector_state, i) {
if (connector_state->crtc != crtc_state->base.crtc)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-02-01 13:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 13:57 [PATCHv2 0/4] Add USB typeC based DP support for BXT platform Durgadoss R
2016-02-01 13:57 ` [PATCHv2 1/4] drm/i915/dp: Export enable/disable_shared_dpll methods Durgadoss R
2016-02-01 13:57 ` [PATCHv2 2/4] drm/i915: Make finding unused crtc as a generic function Durgadoss R
2016-02-12 16:53 ` Ander Conselvan De Oliveira
2016-02-15 6:42 ` R, Durgadoss
2016-02-01 13:57 ` Durgadoss R [this message]
2016-02-01 13:57 ` [PATCHv2 4/4] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT Durgadoss R
2016-02-12 16:43 ` Ander Conselvan De Oliveira
2016-02-12 16:44 ` [PATCH] drm/i915: Split bxt_ddi_pll_select() Ander Conselvan de Oliveira
2016-02-15 6:41 ` [PATCHv2 4/4] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT R, Durgadoss
2016-02-12 17:12 ` Ville Syrjälä
2016-02-15 6:55 ` R, Durgadoss
2016-02-15 13:25 ` Ville Syrjälä
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=1454335073-20405-4-git-send-email-durgadoss.r@intel.com \
--to=durgadoss.r@intel.com \
--cc=ander.conselvan.de.oliveira@intel.com \
--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.