drm/i915/skl: Add back HDMI translation table
Subsystems (2)
PATCH 1/1 drm/i915/skl: Add back HDMI translation table
The HDMI translation table is added back to bspec, so adding it, and defaulting the 800mV+0dB entry.
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +12 -10
@@ -155,8 +155,17 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = {static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { -/* Idx NT mV T mV db */ - {0x00004014 ,0x00000087 },/* 0: 800 1000 2 */ + {0x00000018 ,0x000000ac }, + {0x00005012 ,0x0000009d }, + {0x00007011 ,0x00000088 }, + {0x00000018 ,0x000000a1 }, + {0x00000018 ,0x00000098 }, + {0x00004013 ,0x00000088 }, + {0x00006012 ,0x00000087 }, + {0x00000018 ,0x000000df }, + {0x00003015 ,0x00000087 }, + {0x00003015 ,0x000000c7 }, + {0x00000018 ,0x000000c7 }, };enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder)
@@ -214,16 +223,9 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) n_edp_entries =ARRAY_SIZE (skl_ddi_translations_dp); } -/* -* On SKL, the recommendation from the hw team is to always use -* a certain type of level shifter (and thus the corresponding -* 800mV+2dB entry). Given that's the only validated entry, we -* override what is in the VBT, at least until further notice. -*/ - hdmi_level =0 ; ddi_translations_hdmi = skl_ddi_translations_hdmi; n_hdmi_entries =ARRAY_SIZE (skl_ddi_translations_hdmi); - hdmi_default_entry =0 ; + hdmi_default_entry =7 ; }else if (IS_BROADWELL (dev)) { ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_dp = bdw_ddi_translations_dp;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 2 lines · Sonika Jindal
The HDMI translation table is added back to bspec, so adding it, and defaulting the 800mV+0dB entry.
"add back"? Please reference the commit that removed the translations.
BR,
Jani.
Quoted 56 lines
Cc Damien Lespiau <[email protected]>Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +12
-10@@ -155,8 +155,17 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = {static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { -/* Idx NT mV T mV db */ - {0x00004014 ,0x00000087 },/* 0: 800 1000 2 */ + {0x00000018 ,0x000000ac }, + {0x00005012 ,0x0000009d }, + {0x00007011 ,0x00000088 }, + {0x00000018 ,0x000000a1 }, + {0x00000018 ,0x00000098 }, + {0x00004013 ,0x00000088 }, + {0x00006012 ,0x00000087 }, + {0x00000018 ,0x000000df }, + {0x00003015 ,0x00000087 }, + {0x00003015 ,0x000000c7 }, + {0x00000018 ,0x000000c7 }, };enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder)@@ -214,16 +223,9 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) n_edp_entries =ARRAY_SIZE (skl_ddi_translations_dp); } -/* -* On SKL, the recommendation from the hw team is to always use -* a certain type of level shifter (and thus the corresponding -* 800mV+2dB entry). Given that's the only validated entry, we -* override what is in the VBT, at least until further notice. -*/ - hdmi_level =0 ; ddi_translations_hdmi = skl_ddi_translations_hdmi; n_hdmi_entries =ARRAY_SIZE (skl_ddi_translations_hdmi); - hdmi_default_entry =0 ; + hdmi_default_entry =7 ; }else if (IS_BROADWELL (dev)) { ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_dp = bdw_ddi_translations_dp;Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Add back HDMI translation table
The HDMI translation table is added back to bspec, so adding it, and defaulting the 800mV+0dB entry.
The HDMI translation table was removed by following commit as per HW team's recommendation:
commit 7ff446708bd1 ("drm/i915/skl: Only use the 800mV+2bB HDMI translation entry")
v2: Adding reference to commit which removed this table (Jani)
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +12 -10
@@ -155,8 +155,17 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = {static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { -/* Idx NT mV T mV db */ - {0x00004014 ,0x00000087 },/* 0: 800 1000 2 */ + {0x00000018 ,0x000000ac }, + {0x00005012 ,0x0000009d }, + {0x00007011 ,0x00000088 }, + {0x00000018 ,0x000000a1 }, + {0x00000018 ,0x00000098 }, + {0x00004013 ,0x00000088 }, + {0x00006012 ,0x00000087 }, + {0x00000018 ,0x000000df }, + {0x00003015 ,0x00000087 }, + {0x00003015 ,0x000000c7 }, + {0x00000018 ,0x000000c7 }, };enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder)
@@ -214,16 +223,9 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) n_edp_entries =ARRAY_SIZE (skl_ddi_translations_dp); } -/* -* On SKL, the recommendation from the hw team is to always use -* a certain type of level shifter (and thus the corresponding -* 800mV+2dB entry). Given that's the only validated entry, we -* override what is in the VBT, at least until further notice. -*/ - hdmi_level =0 ; ddi_translations_hdmi = skl_ddi_translations_hdmi; n_hdmi_entries =ARRAY_SIZE (skl_ddi_translations_hdmi); - hdmi_default_entry =0 ; + hdmi_default_entry =7 ; }else if (IS_BROADWELL (dev)) { ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_dp = bdw_ddi_translations_dp;
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Sonika Jindal
The HDMI translation table is added back to bspec, so adding it, and defaulting the 800mV+0dB entry.
The HDMI translation table was removed by following commit as per HW team's recommendation:
commit7ff446708bd1("drm/i915/skl: Only use the 800mV+2bB HDMI translation entry")v2: Adding reference to commit which removed this table (Jani)
Cc Damien Lespiau <[email protected]>Signed-off-by Sonika Jindal <[email protected]>
Quoted 49 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +12
-10@@ -155,8 +155,17 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = {static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { -/* Idx NT mV T mV db */ - {0x00004014 ,0x00000087 },/* 0: 800 1000 2 */ + {0x00000018 ,0x000000ac }, + {0x00005012 ,0x0000009d }, + {0x00007011 ,0x00000088 }, + {0x00000018 ,0x000000a1 }, + {0x00000018 ,0x00000098 }, + {0x00004013 ,0x00000088 }, + {0x00006012 ,0x00000087 }, + {0x00000018 ,0x000000df }, + {0x00003015 ,0x00000087 }, + {0x00003015 ,0x000000c7 }, + {0x00000018 ,0x000000c7 }, };enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder)@@ -214,16 +223,9 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port) n_edp_entries =ARRAY_SIZE (skl_ddi_translations_dp); } -/* -* On SKL, the recommendation from the hw team is to always use -* a certain type of level shifter (and thus the corresponding -* 800mV+2dB entry). Given that's the only validated entry, we -* override what is in the VBT, at least until further notice. -*/ - hdmi_level =0 ; ddi_translations_hdmi = skl_ddi_translations_hdmi; n_hdmi_entries =ARRAY_SIZE (skl_ddi_translations_hdmi); - hdmi_default_entry =0 ; + hdmi_default_entry =7 ; }else if (IS_BROADWELL (dev)) { ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_dp = bdw_ddi_translations_dp;Signature · 1 line
1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6190 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -3 276/276 273/276 ILK -1 301/301 300/301 SNB 316/316 316/316 IVB -1 328/328 327/328 BYT 285/285 285/285 HSW 394/394 394/394 BDW 321/321 321/321 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt@gem_userptr_blits@coherency-sync CRASH(2)PASS(5) FAIL(1)PASS(1) PNV igt@gem_userptr_blits@coherency-unsync CRASH(2)PASS(6) CRASH(1)PASS(1) *PNV igt@gen3_render_tiledy_blits FAIL(4)PASS(8) CRASH(1)PASS(1) *ILK igt@gem_unfence_active_buffers PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...bsd_ring_idle@Hangcheck timer elapsed... bsd ring idle
IVB igt@gem_pwrite_pread@uncached-copy-performance DMESG_WARN(3)PASS(8) DMESG_WARN(2)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
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: 6190 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -3 276/276 273/276 ILK -1 301/301 300/301 SNB 316/316 316/316 IVB -1 328/328 327/328 BYT 285/285 285/285 HSW 394/394 394/394 BDW 321/321 321/321 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt@gem_userptr_blits@coherency-sync CRASH(2)PASS(5) FAIL(1)PASS(1) PNV igt@gem_userptr_blits@coherency-unsync CRASH(2)PASS(6) CRASH(1)PASS(1) *PNV igt@gen3_render_tiledy_blits FAIL(4)PASS(8) CRASH(1)PASS(1) *ILK igt@gem_unfence_active_buffers PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...bsd_ring_idle@Hangcheck timer elapsed... bsd ring idle
IVB igt@gem_pwrite_pread@uncached-copy-performance DMESG_WARN(3)PASS(8) DMESG_WARN(2)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
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