resolve merge conflicts of 42ca6159e52c5a2217825da02a26cf504998301b to stage-aosp...

[android-x86/external-minigbm.git] / rockchip.c

diff --git a/rockchip.c b/rockchip.c
index 125e100..9ef7962 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -101,8 +101,7 @@ static int rockchip_init(struct driver *drv)
         */
        drv_add_combination(drv, DRM_FORMAT_R8, &metadata,
                            BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SW_MASK |
-                               BO_USE_LINEAR | BO_USE_PROTECTED | BO_USE_HW_VIDEO_DECODER |
-                               BO_USE_HW_VIDEO_ENCODER);
+                               BO_USE_LINEAR | BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 
        return 0;
 }