diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
| commit | 1d8ac08d498d579aae36221a80b4b724b2f52f39 (patch) | |
| tree | 3177ed7b82edbb34055da95c50b418db5cd4ba60 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | 5c7f0c27956a9884e29dbe5f83e56609fa00290f (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | blackbird-op-linux-1d8ac08d498d579aae36221a80b4b724b2f52f39.tar.gz blackbird-op-linux-1d8ac08d498d579aae36221a80b4b724b2f52f39.zip | |
Merge tag 'v4.0-rc7' into drm-next
Linux 4.0-rc7
Requested by Alex for fixes -next needs.
Conflicts:
drivers/gpu/drm/i915/intel_sprite.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e9ff6fc61267..a4c0a04b5044 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1113,7 +1113,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data, drm_modeset_lock_all(dev); plane = drm_plane_find(dev, set->plane_id); - if (!plane) { + if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) { ret = -ENOENT; goto out_unlock; } |
