drm/i915: Clarify HW context size logic

This was a rebase error from when the patches originally landed. Since
the context size is unsigned, there is also no use in checking if it's
less than 0.

The existing code is not really wrong, but it's not simple as it should
be.

Signed-off-by: Ben Widawsky <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index a3f06bcad551d844c1e3649fee266466a04ff759..e7ecafa8e598c0903457814de5648957e92962d4 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -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;
        }