diff options
author | Jani Nikula <jani.nikula@intel.com> | 2017-10-18 12:37:31 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-10-18 12:37:31 +0300 |
commit | 526b96c4f8dceb0104e267c61e5a3b22c538570c (patch) | |
tree | 8825258c4f678f5ad9fddc0afaf72d640458481a /drivers/gpu/drm/i915/intel_sprite.c | |
parent | cb8d50dfb341e9615c8d203a3e6513dae9ff901d (diff) | |
parent | 40d86701a625eed9e644281b9af228d6a52d8ed9 (diff) | |
download | op-kernel-dev-526b96c4f8dceb0104e267c61e5a3b22c538570c.zip op-kernel-dev-526b96c4f8dceb0104e267c61e5a3b22c538570c.tar.gz |
Merge drm-upstream/drm-next into drm-intel-next-queued
Needed for timer_setup() and drm_dev_{get,put}() conversions in i915.
Signed-off-by: Jani Nikula <jani.nikula@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 f293696..86fc9b5 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1000,7 +1000,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data, set->flags & I915_SET_COLORKEY_DESTINATION) return -EINVAL; - plane = drm_plane_find(dev, set->plane_id); + plane = drm_plane_find(dev, file_priv, set->plane_id); if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) return -ENOENT; |