diff mbox

[v2] drm/i915/skl: Implement WaDisableHBR2

Message ID 1423676604-21087-1-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Feb. 11, 2015, 5:43 p.m. UTC
v2: Use the recently introduced INTEL_REVID() and SKL_REVID defines
    (Nick Hoath)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Shuang He Feb. 13, 2015, 5:09 a.m. UTC | #1
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5762
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                 -1              282/282              281/282
ILK                                  313/313              313/313
SNB                                  309/323              309/323
IVB                                  380/380              380/380
BYT                                  296/296              296/296
HSW                 -1              425/425              424/425
BDW                 -1              318/318              317/318
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt_gen3_render_linear_blits      PASS(5)      CRASH(1)PASS(1)
*HSW  igt_gem_storedw_loop_blt      PASS(3)      DMESG_WARN(1)PASS(1)
*BDW  igt_gem_gtt_hog      PASS(8)      DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
Jesse Barnes March 12, 2015, 6:18 p.m. UTC | #2
On 02/11/2015 09:43 AM, Damien Lespiau wrote:
> v2: Use the recently introduced INTEL_REVID() and SKL_REVID defines
>     (Nick Hoath)
> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index d4c82d7..a7bc3e8 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -129,7 +129,10 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)
>  	case DP_LINK_BW_2_7:
>  		break;
>  	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
> -		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
> +		if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
> +			/* WaDisableHBR2:skl */
> +			max_link_bw = DP_LINK_BW_2_7;
> +		else if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
>  		     INTEL_INFO(dev)->gen >= 8) &&
>  		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)
>  			max_link_bw = DP_LINK_BW_5_4;
> 

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Jani Nikula March 12, 2015, 6:36 p.m. UTC | #3
On Thu, 12 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On 02/11/2015 09:43 AM, Damien Lespiau wrote:
>> v2: Use the recently introduced INTEL_REVID() and SKL_REVID defines
>>     (Nick Hoath)
>> 
>> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index d4c82d7..a7bc3e8 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -129,7 +129,10 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)
>>  	case DP_LINK_BW_2_7:
>>  		break;
>>  	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
>> -		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
>> +		if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
>> +			/* WaDisableHBR2:skl */
>> +			max_link_bw = DP_LINK_BW_2_7;
>> +		else if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
>>  		     INTEL_INFO(dev)->gen >= 8) &&
>>  		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)
>>  			max_link_bw = DP_LINK_BW_5_4;
>> 
>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Potentially

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89554


> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jesse Barnes March 12, 2015, 7:03 p.m. UTC | #4
On 03/12/2015 11:36 AM, Jani Nikula wrote:
> On Thu, 12 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>> On 02/11/2015 09:43 AM, Damien Lespiau wrote:
>>> v2: Use the recently introduced INTEL_REVID() and SKL_REVID defines
>>>     (Nick Hoath)
>>>
>>> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
>>> ---
>>>  drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>>> index d4c82d7..a7bc3e8 100644
>>> --- a/drivers/gpu/drm/i915/intel_dp.c
>>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>>> @@ -129,7 +129,10 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)
>>>  	case DP_LINK_BW_2_7:
>>>  		break;
>>>  	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
>>> -		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
>>> +		if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
>>> +			/* WaDisableHBR2:skl */
>>> +			max_link_bw = DP_LINK_BW_2_7;
>>> +		else if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
>>>  		     INTEL_INFO(dev)->gen >= 8) &&
>>>  		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)
>>>  			max_link_bw = DP_LINK_BW_5_4;
>>>
>>
>> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>> Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> Potentially
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89554

Yeah hopefully.  I definitely need it here for eDP to come up reliably.

Jesse
Daniel Vetter March 13, 2015, 9:21 a.m. UTC | #5
On Thu, Mar 12, 2015 at 12:03:51PM -0700, Jesse Barnes wrote:
> On 03/12/2015 11:36 AM, Jani Nikula wrote:
> > On Thu, 12 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >> On 02/11/2015 09:43 AM, Damien Lespiau wrote:
> >>> v2: Use the recently introduced INTEL_REVID() and SKL_REVID defines
> >>>     (Nick Hoath)
> >>>
> >>> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> >>> ---
> >>>  drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
> >>>  1 file changed, 4 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> >>> index d4c82d7..a7bc3e8 100644
> >>> --- a/drivers/gpu/drm/i915/intel_dp.c
> >>> +++ b/drivers/gpu/drm/i915/intel_dp.c
> >>> @@ -129,7 +129,10 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)
> >>>  	case DP_LINK_BW_2_7:
> >>>  		break;
> >>>  	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
> >>> -		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
> >>> +		if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
> >>> +			/* WaDisableHBR2:skl */
> >>> +			max_link_bw = DP_LINK_BW_2_7;
> >>> +		else if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
> >>>  		     INTEL_INFO(dev)->gen >= 8) &&
> >>>  		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)
> >>>  			max_link_bw = DP_LINK_BW_5_4;
> >>>
> >>
> >> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> >> Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 
> > Potentially
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89554
> 
> Yeah hopefully.  I definitely need it here for eDP to come up reliably.

Queued for -next, thanks for the patch.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d4c82d7..a7bc3e8 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -129,7 +129,10 @@  intel_dp_max_link_bw(struct intel_dp *intel_dp)
 	case DP_LINK_BW_2_7:
 		break;
 	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */
-		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
+		if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)
+			/* WaDisableHBR2:skl */
+			max_link_bw = DP_LINK_BW_2_7;
+		else if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||
 		     INTEL_INFO(dev)->gen >= 8) &&
 		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)
 			max_link_bw = DP_LINK_BW_5_4;