projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2015-12-18' of git://anongit.freedesktop.org/drm-intel...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_sprite.c
diff --git
a/drivers/gpu/drm/i915/intel_sprite.c
b/drivers/gpu/drm/i915/intel_sprite.c
index
dbf4213
..
4ff7a1f
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_sprite.c
+++ b/
drivers/gpu/drm/i915/intel_sprite.c
@@
-951,7
+951,7
@@
int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))
return -EINVAL;
if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))
return -EINVAL;
- if (
IS_VALLEYVIEW(dev
) &&
+ if (
(IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)
) &&
set->flags & I915_SET_COLORKEY_DESTINATION)
return -EINVAL;
set->flags & I915_SET_COLORKEY_DESTINATION)
return -EINVAL;
@@
-1086,7
+1086,7
@@
intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
intel_plane->max_downscale = 1;
}
intel_plane->max_downscale = 1;
}
- if (IS_VALLEYVIEW(dev)) {
+ if (IS_VALLEYVIEW(dev)
|| IS_CHERRYVIEW(dev)
) {
intel_plane->update_plane = vlv_update_plane;
intel_plane->disable_plane = vlv_disable_plane;
intel_plane->update_plane = vlv_update_plane;
intel_plane->disable_plane = vlv_disable_plane;