diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 10:02:39 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 10:02:39 +0100 |
| commit | c09cd6e9691ec6fce8cb90b65929cad389d39c84 (patch) | |
| tree | d76104420f72172b21b8fb5ca512baa016ac892b /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | 7eb1c496f7ac0f386552c0cd9144f6965fc61da5 (diff) | |
| parent | 96ab4c70396e4e5a4d623bc95e86484682bef78f (diff) | |
Merge branch 'backlight-rework' into drm-intel-next-queued
Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 4625670bcad..2ec122a6340 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -117,6 +117,9 @@ static int get_context_size(struct drm_device *dev) else ret = GEN7_CXT_TOTAL_SIZE(reg) * 64; break; + case 8: + ret = GEN8_CXT_TOTAL_SIZE; + break; default: BUG(); } |