From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Vandita Kulkarni <vandita.kulkarni@intel.com>,
Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 1/5] drm/i915/ddi: s/crtc->config/old_crtc_state in haswell_crtc_disable()
Date: Wed, 13 Jun 2018 20:07:06 +0300 [thread overview]
Message-ID: <20180613170710.15080-2-imre.deak@intel.com> (raw)
In-Reply-To: <20180613170710.15080-1-imre.deak@intel.com>
crtc->config points to the old crtc state at the point
display.crtc_disable() is called, so use the more descriptive pointer
instead.
Cc: Vandita Kulkarni <vandita.kulkarni@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0ddb9b5952a5..d9170e514825 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5824,8 +5824,8 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
if (!transcoder_is_dsi(cpu_transcoder))
intel_disable_pipe(old_crtc_state);
- if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST))
- intel_ddi_set_vc_payload_alloc(intel_crtc->config, false);
+ if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST))
+ intel_ddi_set_vc_payload_alloc(old_crtc_state, false);
if (!transcoder_is_dsi(cpu_transcoder))
intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
@@ -5836,7 +5836,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
ironlake_pfit_disable(intel_crtc, false);
if (!transcoder_is_dsi(cpu_transcoder))
- intel_ddi_disable_pipe_clock(intel_crtc->config);
+ intel_ddi_disable_pipe_clock(old_crtc_state);
intel_encoders_post_disable(crtc, old_crtc_state, old_state);
--
2.13.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-06-13 17:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 17:07 [PATCH 0/5] drm/i915/icl: Fix HDMI infoframe setting Imre Deak
2018-06-13 17:07 ` Imre Deak [this message]
2018-06-13 17:43 ` [PATCH 1/5] drm/i915/ddi: s/crtc->config/old_crtc_state in haswell_crtc_disable() Ville Syrjälä
2018-06-13 17:07 ` [PATCH 2/5] drm/i915/ddi: Push pipe clock enabling to encoders Imre Deak
2018-06-13 17:27 ` [PATCH v2 " Imre Deak
2018-06-13 17:46 ` Ville Syrjälä
2018-06-13 17:07 ` [PATCH 3/5] drm/i915/ddi: Check transcoder instead of port when setting HDMI infoframe Imre Deak
2018-06-13 17:47 ` Ville Syrjälä
2018-06-13 17:07 ` [PATCH 4/5] drm/i915/ddi: Set HDMI infoframes with pipe clocks enabled Imre Deak
2018-06-13 17:49 ` Ville Syrjälä
2018-06-13 17:07 ` [PATCH 5/5] drm/i915/ddi: Removed unused var from hsw_write_infoframe() Imre Deak
2018-06-13 17:51 ` Ville Syrjälä
2018-06-13 17:13 ` ✗ Fi.CI.BAT: failure for drm/i915/icl: Fix HDMI infoframe setting Patchwork
2018-06-13 18:02 ` ✓ Fi.CI.BAT: success for drm/i915/icl: Fix HDMI infoframe setting (rev2) Patchwork
2018-06-13 22:03 ` ✓ Fi.CI.IGT: " Patchwork
2018-06-14 17:32 ` Imre Deak
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=20180613170710.15080-2-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
--cc=vandita.kulkarni@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox