[Intel-gfx] [PATCH 1/2] drm/i915: add a few missing platform tags to workaround tags

[Jani Nikula]

On Mon, 26 Sep 2016, Paulo Zanoni <paulo.r.zanoni at intel.com> wrote:
> Em Seg, 2016-09-26 às 15:07 +0300, Jani Nikula escreveu:
>> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

Thanks, pushed both to dinq.

BR,
Jani.

>
>> ---
>>  drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
>>  drivers/gpu/drm/i915/intel_pm.c         | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
>> b/drivers/gpu/drm/i915/intel_guc_loader.c
>> index a4e37c8db782..7ace96be82a8 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -381,7 +381,7 @@ static int guc_ucode_xfer(struct drm_i915_private
>> *dev_priv)
>>  					      ~GUC_ENABLE_MIA_CLOCK_
>> GATING));
>>  	}
>>  
>> -	/* WaC6DisallowByGfxPause*/
>> +	/* WaC6DisallowByGfxPause:bxt */
>>  	if (IS_BXT_REVID(dev, 0, BXT_REVID_B0))
>>  		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>>  
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c
>> b/drivers/gpu/drm/i915/intel_pm.c
>> index a860c4082eb8..fa6472b2d0c7 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -5334,7 +5334,7 @@ static void gen9_enable_rc6(struct
>> drm_i915_private *dev_priv)
>>  	if (intel_enable_rc6() & INTEL_RC6_ENABLE)
>>  		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
>>  	DRM_INFO("RC6 %s\n", onoff(rc6_mask &
>> GEN6_RC_CTL_RC6_ENABLE));
>> -	/* WaRsUseTimeoutMode */
>> +	/* WaRsUseTimeoutMode:bxt */
>>  	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
>>  		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
>>  		I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |

-- 
Jani Nikula, Intel Open Source Technology Center