xf86-video-intel: 2 commits - src/meson.build src/sna/sna_video_sprite.c

[Chris Wilson]

 src/meson.build            |    1 +
 src/sna/sna_video_sprite.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3d395062ce73f85e8340218df01c2ebf4bc25023
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date:   Fri Jun 1 20:10:02 2018 +0300

    meson: Add libdrm dependency for intel_drv
    
    Looks like we need a libdrm dep on intel_drv. Build fails for me on
    Arch.
    
    In file included from ../src/intel_device.c:51:
    /usr/include/xf86drm.h:40:10: fatal error: drm.h: No such file or directory
     #include <drm.h>
    
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

diff --git a/src/meson.build b/src/meson.build
index 3998dac8..c038ba3e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -92,6 +92,7 @@ intel_drv_sources = [
 
 intel_drv_deps = [
   dependency('pciaccess', version : '>= 0.10', required : true),
+  libdrm,
   xorg,
 ]
 
commit ce31859ae56a78019d7212ca58a9e44564fb2e7a
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date:   Fri Jun 8 22:28:35 2018 +0300

    sna/video/sprite: Remove the XV_ALWAYS_ON_TOP restriction for SKL+ scaling
    
    On SKL+ the dst colorkey is enabled on the primary plane instead of the
    sprite plane. That means the restriction of scaling vs. keying doesn't
    actually apply here as we never scale the primary. So let's remove
    the requirement of having XV_ALWAYS_ON_TOP enabled to get hw scaling.
    
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c
index f713abcb..8b7ae8ae 100644
--- a/src/sna/sna_video_sprite.c
+++ b/src/sna/sna_video_sprite.c
@@ -49,7 +49,7 @@
 #define DRM_FORMAT_NV12         fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */
 
 #define has_hw_scaling(sna, video) ((sna)->kgem.gen < 071 || \
-				    ((sna)->kgem.gen >= 0110 && (video)->AlwaysOnTop))
+				    (sna)->kgem.gen >= 0110)
 
 
 #define LOCAL_IOCTL_MODE_SETPLANE	DRM_IOWR(0xB7, struct local_mode_set_plane)