diff options
| author |   Ben Widawsky <ben@bwidawsk.net> | 2012-07-24 20:47:30 -0700 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-25 18:23:56 +0200 |
| commit | 2e4291e0bc6cff9514515a899a8158ea62b3ff90 (patch) | |
| tree | a3896ac39e93ff71799819c7d98702558f77298d /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | drm/i915: Avoid concurrent access when marking the device as idle/busy (diff) | |
| download | linux-dev-2e4291e0bc6cff9514515a899a8158ea62b3ff90.tar.xz linux-dev-2e4291e0bc6cff9514515a899a8158ea62b3ff90.zip | |
drm/i915: Add contexts for HSW
Basic context support on HSW is no different than previous generations.
The size of the context object changes, but that's about it.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5d0d6ad489e2..5c2d354cebbd 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -112,7 +112,10 @@ static int get_context_size(struct drm_device *dev) break; case 7: reg = I915_READ(GEN7_CXT_SIZE); - ret = GEN7_CXT_TOTAL_SIZE(reg) * 64; + if (IS_HASWELL(dev)) + ret = HSW_CXT_TOTAL_SIZE(reg) * 64; + else + ret = GEN7_CXT_TOTAL_SIZE(reg) * 64; break; default: BUG(); |