* [PATCH] drm/i915/hdmi: fix vlv infoframe port check
@ 2015-04-29 11:29 Jani Nikula
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
2015-04-30 22:20 ` [PATCH] drm/i915/hdmi: fix vlv infoframe port check shuang.he
0 siblings, 2 replies; 6+ messages in thread
From: Jani Nikula @ 2015-04-29 11:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi
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 <jbarnes@virtuousgeek.org>
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
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_hdmi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e63f0b9260e9..7774ca2b9bdf 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -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;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
2015-04-29 11:29 [PATCH] drm/i915/hdmi: fix vlv infoframe port check Jani Nikula
@ 2015-04-29 12:30 ` Jani Nikula
2015-04-29 16:10 ` Jesse Barnes
2015-05-01 2:10 ` shuang.he
2015-04-30 22:20 ` [PATCH] drm/i915/hdmi: fix vlv infoframe port check shuang.he
1 sibling, 2 replies; 6+ messages in thread
From: Jani Nikula @ 2015-04-29 12:30 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: Rodrigo Vivi
Add port check for ibx similar to vlv in
commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Apr 15 16:52:29 2015 -0700
drm/i915/vlv: check port in infoframe_enabled v2
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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 7774ca2b9bdf..65bc3867dda2 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -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,
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
@ 2015-04-29 16:10 ` Jesse Barnes
2015-04-30 8:34 ` Jani Nikula
2015-05-01 2:10 ` shuang.he
1 sibling, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2015-04-29 16:10 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: Rodrigo Vivi
On 04/29/2015 05:30 AM, Jani Nikula wrote:
> Add port check for ibx similar to vlv in
>
> commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date: Wed Apr 15 16:52:29 2015 -0700
>
> drm/i915/vlv: check port in infoframe_enabled v2
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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 7774ca2b9bdf..65bc3867dda2 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -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,
>
Ah great, thanks Jani. R-b for both.
Jesse
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
2015-04-29 16:10 ` Jesse Barnes
@ 2015-04-30 8:34 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2015-04-30 8:34 UTC (permalink / raw)
To: Jesse Barnes, intel-gfx; +Cc: Rodrigo Vivi
On Wed, 29 Apr 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On 04/29/2015 05:30 AM, Jani Nikula wrote:
>> Add port check for ibx similar to vlv in
>>
>> commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
>> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
>> Date: Wed Apr 15 16:52:29 2015 -0700
>>
>> drm/i915/vlv: check port in infoframe_enabled v2
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> 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 7774ca2b9bdf..65bc3867dda2 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -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,
>>
>
> Ah great, thanks Jani. R-b for both.
Both pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
>
> Jesse
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/hdmi: fix vlv infoframe port check
2015-04-29 11:29 [PATCH] drm/i915/hdmi: fix vlv infoframe port check Jani Nikula
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
@ 2015-04-30 22:20 ` shuang.he
1 sibling, 0 replies; 6+ messages in thread
From: shuang.he @ 2015-04-30 22:20 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, jani.nikula
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
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
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
2015-04-29 16:10 ` Jesse Barnes
@ 2015-05-01 2:10 ` shuang.he
1 sibling, 0 replies; 6+ messages in thread
From: shuang.he @ 2015-05-01 2:10 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, jani.nikula
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task 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
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-05-01 2:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-29 11:29 [PATCH] drm/i915/hdmi: fix vlv infoframe port check Jani Nikula
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
2015-04-29 16:10 ` Jesse Barnes
2015-04-30 8:34 ` Jani Nikula
2015-05-01 2:10 ` shuang.he
2015-04-30 22:20 ` [PATCH] drm/i915/hdmi: fix vlv infoframe port check shuang.he
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.