summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-11-10 10:56:04 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 23:51:47 +0100
commitf94982b0022f474d3c9285447d9a33b7a324e771 (patch)
tree1bd5afc715725c625d694ac2753ede392cd8d836 /drivers/gpu/drm
parent0e8b3d3ea7c8f6e65c2c7220d64cbeb78023eff4 (diff)
downloadop-kernel-dev-f94982b0022f474d3c9285447d9a33b7a324e771.zip
op-kernel-dev-f94982b0022f474d3c9285447d9a33b7a324e771.tar.gz
drm/i915: Allocate the proper size for contexts.
Whoops. This was fixed previously, but not sure how it got lost. It's not needed for -fixes or stable because at the moment drm_i915_file_private is way bigger than i915_hw_context (by 120 bytes on my 64b build). Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 05ed42f..0e510df 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -146,7 +146,7 @@ create_hw_context(struct drm_device *dev,
struct i915_hw_context *ctx;
int ret, id;
- ctx = kzalloc(sizeof(struct drm_i915_file_private), GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (ctx == NULL)
return ERR_PTR(-ENOMEM);
OpenPOWER on IntegriCloud