diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-13 00:27:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-13 00:27:25 -0400 |
| commit | fceccc9f81decf3c27f71701c57012cd7fe09cc1 (patch) | |
| tree | d70831f3621bf2263e4c4c9156038b24f4d23986 | |
| parent | eefd45908cdcf6b9f35f528a4fa00c315ab85ae9 (diff) | |
| download | longterm-queue-4.8-fceccc9f81decf3c27f71701c57012cd7fe09cc1.tar.gz | |
drm: i915: refresh byt patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch b/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch index 2c2d067..9f8c804 100644 --- a/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch +++ b/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch @@ -1,4 +1,4 @@ -From 8f68d591d4765b2e1ce9d916ac7bc5583285c4ad Mon Sep 17 00:00:00 2001 +From 686403c22d88722c3563caab43a89dbc9a12d677 Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris@chris-wilson.co.uk> Date: Mon, 13 Mar 2017 17:06:17 +0000 Subject: [PATCH] drm/i915: Stop using RP_DOWN_EI on Baytrail @@ -26,13 +26,14 @@ Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170313170617.31564-1-chris@chris-wilson.co.uk (cherry picked from commit e0e8c7cb6eb68e9256de2d8cbeb481d3701c05ac) Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 80be09831a52..1e53c31b6826 100644 +index 6b52ce8e21d9..9cb71ca088af 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1325,7 +1325,7 @@ struct intel_gen6_power_mgmt { - unsigned boosts; +@@ -1199,7 +1199,7 @@ struct intel_gen6_power_mgmt { + struct intel_rps_client semaphores, mmioflips; /* manual wa residency calculations */ - struct intel_rps_ei up_ei, down_ei; @@ -41,10 +42,10 @@ index 80be09831a52..1e53c31b6826 100644 /* * Protects RPS/RC6 register access and PCU communication. diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 4fc8973744b4..b6c886ac901b 100644 +index 1c2aec392412..234b29b80a19 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -1046,68 +1046,51 @@ static void vlv_c0_read(struct drm_i915_private *dev_priv, +@@ -992,68 +992,51 @@ static void vlv_c0_read(struct drm_i915_private *dev_priv, ei->media_c0 = I915_READ(VLV_MEDIA_C0_COUNT); } @@ -140,7 +141,7 @@ index 4fc8973744b4..b6c886ac901b 100644 return events; } -@@ -4228,7 +4211,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv) +@@ -4520,7 +4503,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv) /* Let's track the enabled rps events */ if (IS_VALLEYVIEW(dev_priv)) /* WaGsvRC0ResidencyMethod:vlv */ @@ -150,10 +151,10 @@ index 4fc8973744b4..b6c886ac901b 100644 dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS; diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c -index 940bab22d464..6a29784d2b41 100644 +index b168076fe0ee..640945f1f998 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c -@@ -4928,8 +4928,9 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val) +@@ -4961,8 +4961,9 @@ static u32 gen6_rps_pm_mask(struct drm_i915_private *dev_priv, u8 val) { u32 mask = 0; @@ -164,7 +165,7 @@ index 940bab22d464..6a29784d2b41 100644 if (val < dev_priv->rps.max_freq_softlimit) mask |= GEN6_PM_RP_UP_EI_EXPIRED | GEN6_PM_RP_UP_THRESHOLD; -@@ -5039,7 +5040,7 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv) +@@ -5062,7 +5063,7 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv) { mutex_lock(&dev_priv->rps.hw_lock); if (dev_priv->rps.enabled) { |