diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-14 14:00:56 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-14 14:00:56 +0200 |
| commit | c5fe557ddec423afa13410fc5927bb90a7c96765 (patch) | |
| tree | 60aafcf77b46349a2bdc808aed92b7a1811cea87 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | 30154650b8b58cd2633475d5a730b44baa140d98 (diff) | |
| parent | c776eb2edfce88f0a44156b417cac3da11d1f944 (diff) | |
| download | op-kernel-dev-c5fe557ddec423afa13410fc5927bb90a7c96765.zip op-kernel-dev-c5fe557ddec423afa13410fc5927bb90a7c96765.tar.gz | |
Merge branch 'topic/bxt-stage1' into drm-intel-next-queued
Separate topic branch for bxt didn't work out since we needed to
refactor the gmbus code a bit to make it look decent. So backmerge.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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 0cb3767..e3d41c0 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1144,7 +1144,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; } |
