* [PATCH] drm/i915/vlv: check port in infoframe_enabled @ 2014-11-20 21:30 Jesse Barnes 2014-11-20 21:41 ` [PATCH] drm/i915/vlv: check port in infoframe_enabled v2 Jesse Barnes 0 siblings, 1 reply; 3+ messages in thread From: Jesse Barnes @ 2014-11-20 21:30 UTC (permalink / raw) To: intel-gfx Same as IBX and G4x, they all share the same genetic material. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index cc48b51..36e8c53 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -328,10 +328,14 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe); u32 val = I915_READ(reg); - return val & VIDEO_DIP_ENABLE; + if (port == (val & VIDEO_DIP_PORT_MASK)) + return val & VIDEO_DIP_ENABLE; + + return false; } static void hsw_write_infoframe(struct drm_encoder *encoder, -- 1.9.1 _______________________________________________ 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
* [PATCH] drm/i915/vlv: check port in infoframe_enabled v2 2014-11-20 21:30 [PATCH] drm/i915/vlv: check port in infoframe_enabled Jesse Barnes @ 2014-11-20 21:41 ` Jesse Barnes 2014-11-23 2:40 ` shuang.he 0 siblings, 1 reply; 3+ messages in thread From: Jesse Barnes @ 2014-11-20 21:41 UTC (permalink / raw) To: intel-gfx Same as IBX and G4x, they all share the same genetic material. v2: we all need a bit more port in our lives Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_hdmi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index cc48b51..43f17ff 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -328,10 +328,15 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder) struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe); u32 val = I915_READ(reg); + u32 port = intel_dig_port->port; - return val & VIDEO_DIP_ENABLE; + if (port == (val & VIDEO_DIP_PORT_MASK)) + return val & VIDEO_DIP_ENABLE; + + return false; } static void hsw_write_infoframe(struct drm_encoder *encoder, -- 1.9.1 _______________________________________________ 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/vlv: check port in infoframe_enabled v2 2014-11-20 21:41 ` [PATCH] drm/i915/vlv: check port in infoframe_enabled v2 Jesse Barnes @ 2014-11-23 2:40 ` shuang.he 0 siblings, 0 replies; 3+ messages in thread From: shuang.he @ 2014-11-23 2:40 UTC (permalink / raw) To: shuang.he, intel-gfx, jbarnes Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) -------------------------------------Summary------------------------------------- Platform Delta drm-intel-nightly Series Applied PNV 367/367 367/367 ILK 373/375 373/375 SNB 450/450 450/450 IVB -5 502/503 497/503 BYT 289/289 289/289 HSW -3 567/567 564/567 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied IVB igt_gem_bad_reloc_negative-reloc-lut NSPT(3, M21M34M4)PASS(1, M21) NSPT(1, M34) IVB igt_kms_plane_plane-panning-bottom-right-pipe-C-plane-1 TIMEOUT(1, M34)PASS(1, M21) DMESG_WARN(1, M34) IVB igt_kms_plane_plane-panning-top-left-pipe-C-plane-1 PASS(2, M21M34) DMESG_WARN(1, M34) IVB igt_kms_plane_plane-position-covered-pipe-C-plane-1 PASS(2, M21M34) DMESG_WARN(1, M34) IVB igt_kms_plane_plane-position-hole-pipe-C-plane-1 PASS(2, M21M34) DMESG_WARN(1, M34) HSW igt_gem_bad_reloc_negative-reloc-lut NSPT(10, M40M20)PASS(1, M20) NSPT(1, M20) HSW igt_kms_rotation_crc_primary-rotation PASS(11, M20M40) DMESG_WARN(1, M20) HSW igt_pm_rc6_residency_rc6-accuracy PASS(11, M20M40) FAIL(1, M20) _______________________________________________ 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:[~2014-11-23 2:40 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-20 21:30 [PATCH] drm/i915/vlv: check port in infoframe_enabled Jesse Barnes 2014-11-20 21:41 ` [PATCH] drm/i915/vlv: check port in infoframe_enabled v2 Jesse Barnes 2014-11-23 2:40 ` shuang.he
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox