drm/i915/hdmi: fix vlv infoframe port check
Subsystems (2)
PATCH 1/1 drm/i915/hdmi: fix vlv infoframe port check
Due to missing shifting, the vlv infoframe port check only works for port A. Fix it. Broken since introduction in
commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
Author: Jesse Barnes <[email protected]> Date: Wed Apr 15 16:52:29 2015 -0700
drm/i915/vlv: check port in infoframe_enabled v2
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90059
--- drivers/gpu/drm/i915/intel_hdmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +1 -2
@@ -327,9 +327,8 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder)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; -if (port == (val &VIDEO_DIP_PORT_MASK )) +if (VIDEO_DIP_PORT (intel_dig_port->port) == (val &VIDEO_DIP_PORT_MASK ))return val &VIDEO_DIP_ENABLE ;return false;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/hdmi: check port in ibx_infoframe_enabled
Add port check for ibx similar to vlv in
commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
Author: Jesse Barnes <[email protected]> Date: Wed Apr 15 16:52:29 2015 -0700
drm/i915/vlv: check port in infoframe_enabled v2
--- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_hdmi.c +5 -1
@@ -223,10 +223,14 @@ static bool ibx_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 =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -return val &VIDEO_DIP_ENABLE ; +if (VIDEO_DIP_PORT (intel_dig_port->port) == (val &VIDEO_DIP_PORT_MASK )) +return val &VIDEO_DIP_ENABLE ; + +return false; } static void cpt_write_infoframe(struct drm_encoder *encoder,
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
Quoted 24 lines · Jani Nikula
Add port check for ibx similar to vlv in
commit
535afa2e9e3c1867460d6981d879b04d8b2b9ab3Author: Jesse Barnes <[email protected]> Date: Wed Apr 15 16:52:29 2015 -0700drm/i915/vlv: check port in
infoframe_enabledv2Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -223,10 +223,14 @@ static bool ibx_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 =TVIDEO_DIP_CTL (intel_crtc->pipe);
drivers/gpu/drm/i915/intel_hdmi.c static bool ibx_infoframe_enabled(struct drm_encoder *encoder) · line 236
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-1u32 val =I915_READ (reg); -return val &VIDEO_DIP_ENABLE ; +if (VIDEO_DIP_PORT (intel_dig_port->port) == (val &VIDEO_DIP_PORT_MASK )) +return val &VIDEO_DIP_ENABLE ; + +return false; } static void cpt_write_infoframe(struct drm_encoder *encoder,
Ah great, thanks Jani. R-b for both.
Jesse
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
Quoted 33 lines · Jesse Barnes
Quoted 32 lines · Jani Nikula
Add port check for ibx similar to vlv in
commit
535afa2e9e3c1867460d6981d879b04d8b2b9ab3Author: Jesse Barnes <[email protected]> Date: Wed Apr 15 16:52:29 2015 -0700drm/i915/vlv: check port in
infoframe_enabledv2Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_hdmi.c +5
-1@@ -223,10 +223,14 @@ static bool ibx_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 =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -return val &VIDEO_DIP_ENABLE ; +if (VIDEO_DIP_PORT (intel_dig_port->port) == (val &VIDEO_DIP_PORT_MASK )) +return val &VIDEO_DIP_ENABLE ; + +return false; }
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdmi.c static bool ibx_infoframe_enabled(struct drm_encoder *encoder) · line 236
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0static void cpt_write_infoframe(struct drm_encoder *encoder,Ah great, thanks Jani. R-b for both.
Both pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
Quoted 2 lines
Jesse
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
In reply to Jani NikulaTask id: 6289 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 264/264 264/264
BYT -3 227/227 224/227
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_dummy_reloc_loop@render FAIL(1)PASS(12) TIMEOUT(1)PASS(1) BYT igt@gem_pipe_control_store_loop@fresh-buffer FAIL(1)TIMEOUT(7)PASS(6) TIMEOUT(2) *BYT igt@gem_threaded_access_tiled FAIL(1)PASS(4) DMESG_WARN(1)
(dmesg patch applied)drm:check_crtc_state[i915]]*ERROR*mismatch_in_has_infoframe(expected#,found#)@mismatch in has_infoframe .* found WARNING:at_drivers/gpu/drm/i915/intel_display.c:#check_crtc_state[i915]()@WARNING:.* at .* check_crtc_state+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6288 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 264/264 264/264
BYT -2 227/227 225/227
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_dummy_reloc_loop@render FAIL(1)PASS(11) TIMEOUT(1)PASS(1)
BYT igt@gem_pipe_control_store_loop@fresh-buffer FAIL(1)TIMEOUT(6)PASS(6) TIMEOUT(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx