Skip to content
This repository has been archived by the owner on Jan 7, 2023. It is now read-only.

[DO NOT MERGE]Revert two patch to pass booting issue #79

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion i915_private.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down