]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/skl: don't fail colorkey + scaler request
authorChandra Konduru <chandra.konduru@intel.com>
Mon, 18 May 2015 23:18:44 +0000 (16:18 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 22 May 2015 06:53:44 +0000 (08:53 +0200)
commit8bd533730e17aa5424bd9a3c99019dacd40ba422
treef6bdc9e06281e0f3c28211fee7f98d19cf0da628
parentce751756b14d3bc3d5cfcb6c61cf42a0dbc44f49
drm/i915/skl: don't fail colorkey + scaler request

There is a mplayer video failure reported with xv.
This is because there is a request to do both plane scaling
and colorkey. Because skl hw doesn't support plane scaling
and colorkey at the same time, request is failed which is expected
behavior.

To make xv operate, this patch allows colorkey continue to work
without using scaler. Then behavior would be similar to platforms
without plane scaler support.

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90449
[danvet: change can_scale to bool as requested by Ville.]
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sprite.c