drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
Subsystems (2)
PATCH 1/1 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
Per BSpec, 400us is "BDW+ Do not use this setting." Also rename 1600us to MAX, as the value varies per platform - pre-CNL it means 1600us, and CNL is 3200us.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -5229,7 +5229,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */ #define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;
@@ -1044,7 +1044,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
== Series Details ==
== Series Details ==
Series: drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
URL : https://patchwork.freedesktop.org/series/31204/
State : success
== Summary ==
Series 31204v1 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
https://patchwork.freedesktop.org/api/1.0/series/31204/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Subgroup hdmi-crc-fast:
dmesg-warn -> PASS (fi-skl-6700k) fdo#103019
Test kms_busy:
Subgroup basic-flip-c:
incomplete -> PASS (fi-bxt-j4205) fdo#102035
Test drv_module_reload:
Subgroup basic-reload-inject:
dmesg-warn -> PASS (fi-glk-1) fdo#102777fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#103019 https://bugs.freedesktop.org/show_bug.cgi?id=103019
fdo#102035 https://bugs.freedesktop.org/show_bug.cgi?id=102035
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:472s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:418s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:526s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:506s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:500s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:494s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:479s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:556s fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:628s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:415s fi-glk-1 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:577s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:426s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:406s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:433s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:476s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:466s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:459s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:578s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:593s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:547s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:460s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:758s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:494s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:476s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:568s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:417s
e650b9cdaff616445f38986379b1c0c4b03a4282 drm-tip: 2017y-09m-29d-11h-52m-41s UTC integration manifest 0bf2524dc912 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5864/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
In reply to James Ausmus== Series Details ==
== Series Details ==
Series: drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming, BDW usage
URL : https://patchwork.freedesktop.org/series/31204/
State : warning
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-pri-indfb-draw-mmap-cpu:
pass -> SKIP (shard-hsw)
Subgroup fbc-1p-primscrn-cur-indfb-draw-mmap-cpu:
pass -> SKIP (shard-hsw)
Subgroup fbc-badstride:
pass -> SKIP (shard-hsw)
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test kms_plane_multiple:
Subgroup atomic-pipe-A-tiling-x:
pass -> SKIP (shard-hsw)
Test pm_rpm:
Subgroup modeset-stress-extra-wait:
pass -> SKIP (shard-hsw)fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2429 pass:1328 dwarn:3 dfail:0 fail:10 skip:1088 time:9894s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5864/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/2 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
In reply to James AusmusRename DP_AUX_CH_CTL_TIME_OUT_1600us to DP_AUX_CH_CTL_TIME_OUT_MAX, as the meaning of the (3 << 26) value varies per platform, but it's always the maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL it means 3200us.
v2:
-Split in to two patches (Rodrigo)
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -5239,7 +5239,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */ #define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1044,7 +1044,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Per BSpec, 400us is "BDW+ Do not use this setting." - not just PORT_A. Set BDW to 600us unconditionally.
v2:
-Split in to two patches (Rodrigo)
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 2 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.
Besides that statement I also found on BSpec:
"
Workaround
Project
BDW, EXCLUDE(CHV)
Set the Timeout timer value to at least 600us before initiating a transaction. "
Also I tracked this on the log and arrived to commit 'a81a507d487c ("drm/i915/bdw: Change dp aux timeout to 600us on DDIA")'
It seems during BDW enabling HW team found that need but only for port A and later they might have extended it and we never noticed.
Ccin't Art and Ben here to see if they can comment on that.
But I believe we should add this so
Quoted 27 lines
v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Runyan, Arthur J
Reviewed-by Rodrigo ViviRe: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
I think the failure was with one particularly slow eDP panel, but it is safer to apply this to all ports.
-----Original Message-----
From: Vivi, Rodrigo
Sent: Wednesday, 4 October, 2017 1:25 PM
To: Ausmus, James <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Runyan, Arthur J <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 2 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.
Besides that statement I also found on BSpec:
"
Workaround
Project
BDW, EXCLUDE(CHV)
Set the Timeout timer value to at least 600us before initiating a transaction. "
Also I tracked this on the log and arrived to commit 'a81a507d487c ("drm/i915/bdw: Change dp aux timeout to 600us on DDIA")'
It seems during BDW enabling HW team found that need but only for port A and later they might have extended it and we never noticed.
Ccin't Art and Ben here to see if they can comment on that.
But I believe we should add this so
Quoted 27 lines
v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 2 lines · Arthur J
I think the failure was with one particularly slow eDP panel, but it is safer to apply this to all ports.
Thanks Art. Anyone else have thoughts/comments on this, or should this be good for merge now?
Thanks!
-James
Quoted 59 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Wednesday, 4 October, 2017 1:25 PM
To: Ausmus, James <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Runyan, Arthur J <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/2] drm/i915/bdw: FixDP_AUX_CH_CTL_TIME_OUTsettingQuoted 2 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.Besides that statement I also found on BSpec:
"
Workaround
Project
BDW, EXCLUDE(CHV)
Set the Timeout timer value to at least 600us before initiating a transaction. "Also I tracked this on the log and arrived to commit '
a81a507d487c("drm/i915/bdw: Change dp aux timeout to 600us on DDIA")'It seems during BDW enabling HW team found that need but only for port A and later they might have extended it and we never noticed.
Ccin't Art and Ben here to see if they can comment on that.
But I believe we should add this so
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 27 lines
v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-2@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us; --2.14.1
Signature · 5 lines
James Ausmus _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 7 lines · James
Quoted 2 lines · Arthur J
I think the failure was with one particularly slow eDP panel, but it is safer to apply this to all ports.
Thanks Art. Anyone else have thoughts/comments on this, or should this be good for merge now?
There was a warning on CI. And v2 didn't get fully tested because CI got confused about name changes on v2.
So, could you please resend as a new series. Without the "in-reply-to" so we get the full CI run on it?
Thanks,
Rodrigo
Quoted 56 lines
Thanks!
-James
Quoted 51 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Wednesday, 4 October, 2017 1:25 PM
To: Ausmus, James <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Runyan, Arthur J <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/2] drm/i915/bdw: FixDP_AUX_CH_CTL_TIME_OUTsettingQuoted 2 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.Besides that statement I also found on BSpec:
"
Workaround
Project
BDW, EXCLUDE(CHV)
Set the Timeout timer value to at least 600us before initiating a transaction. "Also I tracked this on the log and arrived to commit '
a81a507d487c("drm/i915/bdw: Change dp aux timeout to 600us on DDIA")'It seems during BDW enabling HW team found that need but only for port A and later they might have extended it and we never noticed.
Ccin't Art and Ben here to see if they can comment on that.
But I believe we should add this so
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 19 lines
v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ;
Quoted 15 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2-if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us; --2.14.1
Signature · 1 line
James Ausmus
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 6 lines · Rodrigo Vivi
Quoted 5 lines · James
Quoted 2 lines · Arthur J
I think the failure was with one particularly slow eDP panel, but it is safer to apply this to all ports.
Quoted 8 lines
Quoted 2 lines
Thanks Art. Anyone else have thoughts/comments on this, or should this be good for merge now?
There was a warning on CI. And v2 didn't get fully tested because CI got confused about name changes on v2.
So, could you please resend as a new series. Without the "in-reply-to" so we get the full CI run on it?
Done - thanks!
-James
Quoted 75 lines
Thanks,
RodrigoQuoted 71 lines
Thanks!
-James
Quoted 51 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Wednesday, 4 October, 2017 1:25 PM
To: Ausmus, James <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Runyan, Arthur J <[email protected]>; [email protected]
Subject: Re: [PATCH v2 2/2] drm/i915/bdw: FixDP_AUX_CH_CTL_TIME_OUTsettingQuoted 2 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.Besides that statement I also found on BSpec:
"
Workaround
Project
BDW, EXCLUDE(CHV)
Set the Timeout timer value to at least 600us before initiating a transaction. "Also I tracked this on the log and arrived to commit '
a81a507d487c("drm/i915/bdw: Change dp aux timeout to 600us on DDIA")'It seems during BDW enabling HW team found that need but only for port A and later they might have extended it and we never noticed.
Ccin't Art and Ben here to see if they can comment on that.
But I believe we should add this so
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 19 lines
v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1019,7 +1019,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ;Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2-if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us; --2.14.1
--
James Ausmus
Signature · 5 lines
James Ausmus _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
In reply to James AusmusQuoted 4 lines · James Ausmus
Rename
DP_AUX_CH_CTL_TIME_OUT_1600ustoDP_AUX_CH_CTL_TIME_OUT_MAX, as the meaning of the (3 << 26) value varies per platform, but it's always the maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL it means 3200us.
Yeap...
Quoted 16 lines
v2:
-Split in to two patches (Rodrigo)Cc Rodrigo Vivi <[email protected]>Signed-off-by James Ausmus <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum { · line 5242
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -5239,7 +5239,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */
makes sense for me...
I was going to complain about the tab+spaces but I notice the whole block there is already like this so nevermind ;)
Quoted 19 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1044,7 +1044,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx