diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
commit | 148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch) | |
tree | 3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/gpu/drm/i915/intel_sprite.c | |
parent | 3ec0af7f223bab9503c4ed57d00ed34b137df476 (diff) | |
parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
download | op-kernel-dev-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.zip op-kernel-dev-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.tar.gz |
Merge airlied/drm-next into drm-intel-next-queued
Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 8e25694..048a4ca 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1165,13 +1165,13 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base, possible_crtcs, &intel_plane_funcs, plane_formats, num_plane_formats, - DRM_PLANE_TYPE_OVERLAY, + NULL, DRM_PLANE_TYPE_OVERLAY, "plane %d%c", plane + 2, pipe_name(pipe)); else ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base, possible_crtcs, &intel_plane_funcs, plane_formats, num_plane_formats, - DRM_PLANE_TYPE_OVERLAY, + NULL, DRM_PLANE_TYPE_OVERLAY, "sprite %c", sprite_name(pipe, plane)); if (ret) goto fail; |