diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-01 00:36:57 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-01 00:36:57 +0400 |
| commit | 955e36d0b4d3e29c9c8a865d166a42718aed302e (patch) | |
| tree | 9913b327cc443e5eb3d399eafb9d460d9261d2f2 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | ce31d9f4fc05964f6c0dd3a8661dc1a1d843a1e2 (diff) | |
| parent | c83155a6044341d67b85b441ba719f86058f6e2b (diff) | |
| download | linux-955e36d0b4d3e29c9c8a865d166a42718aed302e.tar.xz | |
Merge branch 'topic/skl-stage1' into drm-intel-next-queued
SKL stage 1 patches still need polish so will likely miss the 3.18
merge window. We've decided to postpone to 3.19 so let's pull this in
to make patch merging and conflict handling easier.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 55a2ebb510bf..e05e0063a3b1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3166,6 +3166,7 @@ static void i915_gem_write_fence(struct drm_device *dev, int reg, obj->stride, obj->tiling_mode); switch (INTEL_INFO(dev)->gen) { + case 9: case 8: case 7: case 6: |