diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-28 23:16:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-28 23:16:24 -0800 |
| commit | fd84b751ddb7dab7a8c22826e7bff85f3ff3f9a6 (patch) | |
| tree | 8fd06aa1580e976a854a0c9e733efa643667fea0 /drivers/gpu/drm/i915/intel_display.c | |
| parent | c0208a33cbc428f66b446f5dd16c91fb76aaab88 (diff) | |
| parent | 03bfd4e19b935adb8be4f7342f13395fb7f11096 (diff) | |
| download | talos-op-linux-fd84b751ddb7dab7a8c22826e7bff85f3ff3f9a6.tar.gz talos-op-linux-fd84b751ddb7dab7a8c22826e7bff85f3ff3f9a6.zip | |
Merge tag 'drm-fixes-for-v4.15-rc6' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"nouveau and i915 regression fixes"
* tag 'drm-fixes-for-v4.15-rc6' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: fix race when adding delayed work items
i915: Reject CCS modifiers for pipe C on Geminilake
drm/i915/gvt: Fix pipe A enable as default for vgpu
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ff9397030092..30cf273d57aa 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13194,7 +13194,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe); primary->check_plane = intel_check_primary_plane; - if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) { + if (INTEL_GEN(dev_priv) >= 10) { intel_primary_formats = skl_primary_formats; num_formats = ARRAY_SIZE(skl_primary_formats); modifiers = skl_format_modifiers_ccs; |
