|
@@ -242,7 +242,6 @@ err_destroy:
|
|
|
void i915_gem_context_init(struct drm_device *dev)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
- uint32_t ctx_size;
|
|
|
|
|
|
if (!HAS_HW_CONTEXTS(dev)) {
|
|
|
dev_priv->hw_contexts_disabled = true;
|
|
@@ -254,11 +253,9 @@ void i915_gem_context_init(struct drm_device *dev)
|
|
|
dev_priv->ring[RCS].default_context)
|
|
|
return;
|
|
|
|
|
|
- ctx_size = get_context_size(dev);
|
|
|
- dev_priv->hw_context_size = get_context_size(dev);
|
|
|
- dev_priv->hw_context_size = round_up(dev_priv->hw_context_size, 4096);
|
|
|
+ dev_priv->hw_context_size = round_up(get_context_size(dev), 4096);
|
|
|
|
|
|
- if (ctx_size <= 0 || ctx_size > (1<<20)) {
|
|
|
+ if (dev_priv->hw_context_size > (1<<20)) {
|
|
|
dev_priv->hw_contexts_disabled = true;
|
|
|
return;
|
|
|
}
|