Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Clarify HW context size logic

Browse Source 
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 <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky 2013-02-07 13:34:19 -08:00 committed by Daniel Vetter
parent cf0a6584aa
commit 07ea0d85ac
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/i915_gem_context.c
View File

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