Ville Syrjälä 6f94b6dd00 drm/i915: Don't reject primary plane windowing with color keying enabled on SKL+ ... On SKL+ plane scaling is mutually exclusive with color keying. The code check for this, but during some refactoring the code got changed to also reject primary plane windowing when color keying is used. There is no such restriction in the hardware, so restore the original logic. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Fixes: 061e4b8d65 ("drm/i915: clean up atomic plane check functions, v2.") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1452883613-28549-1-git-send-email-ville.syrjala@linux.intel.com Cc: stable@vger.kernel.org Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (cherry picked from commit 693bdc28a7) Signed-off-by: Jani Nikula <jani.nikula@intel.com>		2016-01-29 09:12:58 +02:00
..
amd	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
armada	Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next	2015-12-23 09:19:58 +10:00
ast	drm: Pass 'name' to drm_encoder_init()	2015-12-11 09:13:20 +01:00
atmel-hlcdc	drm: use dev_name as default unique name in drm_dev_alloc()	2015-12-15 13:56:06 +01:00
bochs	drm/bochs: Constify function pointer structs	2015-12-15 13:42:36 +01:00
bridge	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
cirrus	drm/cirrus: Constify function pointer structs	2015-12-15 13:43:59 +01:00
etnaviv	drm/etnaviv: fix workaround for GC500	2016-01-07 11:57:57 +01:00
exynos	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
fsl-dcu	drm: use dev_name as default unique name in drm_dev_alloc()	2015-12-15 13:56:06 +01:00
gma500	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
i2c	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
i810
i915	drm/i915: Don't reject primary plane windowing with color keying enabled on SKL+	2016-01-29 09:12:58 +02:00
imx	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
mga
mgag200	asm-generic changes for 4.5	2016-01-20 17:30:20 -08:00
msm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
nouveau	asm-generic changes for 4.5	2016-01-20 17:30:20 -08:00
omapdrm	fbdev changes for 4.5	2016-01-18 11:58:31 -08:00
panel	drm/panel: simple: Add QiaoDian qd43003c0-40	2015-12-16 18:15:26 +01:00
qxl	drm/qxl: use to_qxl_bo macro	2015-12-15 13:39:40 +01:00
r128
radeon	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
rcar-du	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
rockchip	drm: rockchip: Support Synopsys DW MIPI DSI	2016-01-06 16:16:39 +08:00
savage
shmobile	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
sis
sti	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
tdfx
tegra	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
tilcdc	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
ttm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
udl	drm/udl: Constify function pointer structs	2015-12-15 13:48:54 +01:00
vc4	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
vgem
via
virtio	virtio: barrier rework+fixes	2016-01-18 16:44:24 -08:00
vmwgfx	drm/vmwgfx: Fix a width / pitch mismatch on framebuffer updates	2016-01-14 07:56:46 +10:00
ati_pcigart.c
drm_agpsupport.c
drm_atomic_helper.c	drm/atomic: Remove drm_atomic_connectors_for_crtc.	2016-01-06 16:37:39 +01:00
drm_atomic.c	drm/atomic: Remove drm_atomic_connectors_for_crtc.	2016-01-06 16:37:39 +01:00
drm_auth.c
drm_bridge.c	drm/bridge: Improve kerneldoc	2015-12-08 16:07:53 +01:00
drm_bufs.c
drm_cache.c
drm_context.c
drm_crtc_helper.c	drm: Add crtc->name and use it in debug messages	2015-12-11 09:13:48 +01:00
drm_crtc_internal.h
drm_crtc.c	drm: Do not set connector->encoder in drivers	2016-01-13 13:30:53 +01:00
drm_debugfs.c
drm_dma.c
drm_dp_helper.c
drm_dp_mst_topology.c	drm/dp/mst: fix in RAD element access	2016-01-04 12:11:20 -05:00
drm_drv.c	drm: move MODULE_PARM_DESC to other file	2016-01-08 15:32:29 +01:00
drm_edid_load.c
drm_edid.c	drm/edid: index CEA/HDMI mode tables using the VIC	2016-01-08 15:30:28 +01:00
drm_encoder_slave.c	drm: Constify drm_encoder_slave_funcs	2015-12-15 13:41:17 +01:00
drm_fb_cma_helper.c	drm/fb_cma_helper: Remove implicit call to disable_unused_functions	2016-01-15 11:16:15 +01:00
drm_fb_helper.c	drm/fb-helper: Use proper plane mask for fb cleanup	2015-12-21 09:54:49 +01:00
drm_flip_work.c
drm_fops.c	Linux 4.4-rc4	2015-12-08 11:04:26 +10:00
drm_gem_cma_helper.c	drm: Use the driver's gem_object_free function from CMA helpers.	2015-12-15 10:23:44 +01:00
drm_gem.c	drm: Remove opencoded drm_gem_object_release_handle()	2016-01-05 16:23:09 +01:00
drm_global.c
drm_hashtab.c	tree wide: use kvfree() than conditional kfree()/vfree()	2016-01-22 17:02:18 -08:00
drm_info.c
drm_internal.h
drm_ioc32.c
drm_ioctl.c
drm_irq.c	drm: move MODULE_PARM_DESC to other file	2016-01-08 15:32:29 +01:00
drm_legacy.h
drm_lock.c	signals: kill block_all_signals() and unblock_all_signals()	2015-11-06 17:50:42 -08:00
drm_memory.c
drm_mipi_dsi.c	drm/dsi: Add Turn On/Shutdown Peripheral command helpers	2015-11-24 10:25:14 +01:00
drm_mm.c
drm_modes.c	drm/doc: Convert to markdown	2015-12-15 10:22:26 +01:00
drm_modeset_lock.c	drm/doc: Convert to markdown	2015-12-15 10:22:26 +01:00
drm_of.c
drm_panel.c
drm_pci.c	drm: add drm_pcie_get_max_link_width helper (v2)	2015-12-21 16:42:31 -05:00
drm_plane_helper.c	drm: Pass 'name' to drm_universal_plane_init()	2015-12-11 09:13:10 +01:00
drm_platform.c
drm_prime.c	drm/doc: Convert to markdown	2015-12-15 10:22:26 +01:00
drm_probe_helper.c	Merge branch 'for-linus' into for-next	2015-12-23 08:33:34 +01:00
drm_rect.c	drm: Add "prefix" parameter to drm_rect_debug_print()	2015-11-24 11:47:46 +01:00
drm_scatter.c
drm_sysfs.c	drm/sysfs: use kobj_to_dev()	2016-01-13 16:43:07 +01:00
drm_trace_points.c
drm_trace.h
drm_vm.c
drm_vma_manager.c
Kconfig	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-01-20 09:45:43 -08:00