commit 366008270a797e7a02f74a3524369ae2786c255e
author Sean Paul <seanpaul@chromium.org> Thu Jun 04 12:08:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 12:08:01 2015 +0000
tree c53d47140f94cbec8fe5c7c25d5a729204b2e5e7
parent 90ddb1e256490f0a31739f8d0ec2ce069c477593
parent 5eeaf6970ee63bffe221da91bddeafcbb8405c78

am 5eeaf697: drm_gralloc: Remove NV12 format

* commit '5eeaf6970ee63bffe221da91bddeafcbb8405c78':
  drm_gralloc: Remove NV12 format

gralloc_drm.h

diff --git a/gralloc_drm.h b/gralloc_drm.h
index c32aaf6..773b5fe 100644
--- a/gralloc_drm.h
+++ b/gralloc_drm.h
@@ -71,7 +71,6 @@
 		break;
 	/* planar; only Y is considered */
 	case HAL_PIXEL_FORMAT_YV12:
-        case HAL_PIXEL_FORMAT_DRM_NV12:
 	case HAL_PIXEL_FORMAT_YCbCr_422_SP:
 	case HAL_PIXEL_FORMAT_YCrCb_420_SP:
 		bpp = 1;
@@ -89,7 +88,6 @@
 	int align_w = 1, align_h = 1, extra_height_div = 0;
 
 	switch (format) {
-	case HAL_PIXEL_FORMAT_DRM_NV12:
 	case HAL_PIXEL_FORMAT_YV12:
 		align_w = 32;
 		align_h = 2;

gralloc_drm_kms.c

diff --git a/gralloc_drm_kms.c b/gralloc_drm_kms.c
index cb02a13..a4f1198 100644
--- a/gralloc_drm_kms.c
+++ b/gralloc_drm_kms.c
@@ -61,8 +61,6 @@
 			return DRM_FORMAT_RGB565;
 		case HAL_PIXEL_FORMAT_YV12:
 			return DRM_FORMAT_YUV420;
-		case HAL_PIXEL_FORMAT_DRM_NV12:
-			return DRM_FORMAT_NV12;
 		default:
 			return 0;
 	}