diff --git a/Android.mk b/Android.mk
index 2a598c6..8b88ca6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@ ifeq ($(strip $(BOARD_USES_MINIGBM)), true)
 
 MINIGBM_GRALLOC_MK := $(call my-dir)/Android.gralloc.mk
 LOCAL_PATH := $(call my-dir)
-intel_drivers := i915 i965
+intel_drivers := i915 i965 iris
 include $(CLEAR_VARS)
 
 SUBDIRS := cros_gralloc
diff --git a/i915_private.c b/i915_private.c
index 7a20a2e..3cb5b6d 100644
--- a/i915_private.c
+++ b/i915_private.c
@@ -83,7 +83,7 @@ int i915_private_add_combinations(struct driver *drv)
 
 	drv_modify_combination(drv, DRM_FORMAT_ABGR8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);
 	drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata,
-			       BO_USE_RENDERING | BO_USE_TEXTURE | BO_USE_CAMERA_MASK);
+			       BO_USE_TEXTURE | BO_USE_CAMERA_MASK);
 	drv_modify_combination(drv, DRM_FORMAT_YUYV, &metadata,
 			       BO_USE_TEXTURE | BO_USE_CAMERA_MASK | BO_USE_RENDERING);
 	drv_modify_combination(drv, DRM_FORMAT_VYUY, &metadata,