hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Move w/a LRI debug message from context-init to driver load 

The spam of every context initialisation saying the same thing is annoying
me! Move the information to the setup of the engine.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301121131.11588-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This commit is contained in:
Chris Wilson 2017-03-01 12:11:31 +00:00
parent dd689287b9
commit 02e012f172
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/i915/intel_engine_cs.c
View File

@ -1009,30 +1009,32 @@ static int glk_init_workarounds(struct intel_engine_cs *engine)
int init_workarounds_ring(struct intel_engine_cs *engine) int init_workarounds_ring(struct intel_engine_cs *engine)
{ {
struct drm_i915_private *dev_priv = engine->i915; struct drm_i915_private *dev_priv = engine->i915;
int err;
WARN_ON(engine->id != RCS); WARN_ON(engine->id != RCS);
dev_priv->workarounds.count = 0; dev_priv->workarounds.count = 0;
dev_priv->workarounds.hw_whitelist_count[RCS] = 0; dev_priv->workarounds.hw_whitelist_count[engine->id] = 0;
if (IS_BROADWELL(dev_priv)) if (IS_BROADWELL(dev_priv))
return bdw_init_workarounds(engine); err = bdw_init_workarounds(engine);
else if (IS_CHERRYVIEW(dev_priv))
if (IS_CHERRYVIEW(dev_priv)) err = chv_init_workarounds(engine);
return chv_init_workarounds(engine); else if (IS_SKYLAKE(dev_priv))
err = skl_init_workarounds(engine);
if (IS_SKYLAKE(dev_priv)) else if (IS_BROXTON(dev_priv))
return skl_init_workarounds(engine); err = bxt_init_workarounds(engine);
else if (IS_KABYLAKE(dev_priv))
if (IS_BROXTON(dev_priv)) err = kbl_init_workarounds(engine);
return bxt_init_workarounds(engine); else if (IS_GEMINILAKE(dev_priv))
err = glk_init_workarounds(engine);
if (IS_KABYLAKE(dev_priv)) else
return kbl_init_workarounds(engine); err = 0;
if (err)
if (IS_GEMINILAKE(dev_priv)) return err;
return glk_init_workarounds(engine);
DRM_DEBUG_DRIVER("%s: Number of context specific w/a: %d\n",
engine->name, dev_priv->workarounds.count);
return 0; return 0;
} }
@ -1066,8 +1068,6 @@ int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
if (ret) if (ret)
return ret; return ret;
DRM_DEBUG_DRIVER("Number of Workarounds emitted: %d\n", w->count);
return 0; return 0;
} }