From: Nick Hoath Date: Tue, 17 Mar 2015 09:39:38 +0000 (+0200) Subject: drm/i915/bxt: HardWare WorkAround ring initialisation for Broxton X-Git-Tag: v4.2-rc1~13^2~58^2~65^2~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cae0437f7a367594cb0abc17ddf337c6b2669fab;p=karo-tx-linux.git drm/i915/bxt: HardWare WorkAround ring initialisation for Broxton Adds framework for Broxton HW WAs Signed-off-by: Nick Hoath Signed-off-by: Imre Deak Reviewed-by: Nick Hoath Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 441e2502b889..abe062a95be8 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1027,6 +1027,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring) return skl_tune_iz_hashing(ring); } +static int bxt_init_workarounds(struct intel_engine_cs *ring) +{ + gen9_init_workarounds(ring); + + return 0; +} + int init_workarounds_ring(struct intel_engine_cs *ring) { struct drm_device *dev = ring->dev; @@ -1044,8 +1051,9 @@ int init_workarounds_ring(struct intel_engine_cs *ring) if (IS_SKYLAKE(dev)) return skl_init_workarounds(ring); - else if (IS_GEN9(dev)) - return gen9_init_workarounds(ring); + + if (IS_BROXTON(dev)) + return bxt_init_workarounds(ring); return 0; }