diff --git a/libs/surfaceflinger/TextureManager.cpp b/libs/surfaceflinger/TextureManager.cpp
index 996a683..d9bdc6a 100644
--- a/libs/surfaceflinger/TextureManager.cpp
+++ b/libs/surfaceflinger/TextureManager.cpp
@@ -102,19 +102,6 @@
 
 bool TextureManager::isSupportedYuvFormat(int format)
 {
-    // TODO: how to we know which YUV formats are supported by the GPU?
-
-    // Adreno 200 supports these
-    // YUVY_adreno
-    // UYVY_adreno
-    // NV21_adreno
-    // YV12_adreno
-    // Adreno 205 adds
-    // NV12_adreno_tiled
-    // NV21_adreno_tiled
-
-    // for now pretend we support them all, failure will happen when
-    // we try to use them.
     return isYuvFormat(format);
 }
 
@@ -129,9 +116,7 @@
     case HAL_PIXEL_FORMAT_UYVY:
     case HAL_PIXEL_FORMAT_NV12:
     case HAL_PIXEL_FORMAT_NV61:
-    case HAL_PIXEL_FORMAT_YV12:
     case HAL_PIXEL_FORMAT_NV12_ADRENO_TILED:
-    case HAL_PIXEL_FORMAT_NV21_ADRENO_TILED:
         return true;
     }
     return false;
diff --git a/libs/ui/PixelFormat.cpp b/libs/ui/PixelFormat.cpp
index 04c4779..c9a5950 100644
--- a/libs/ui/PixelFormat.cpp
+++ b/libs/ui/PixelFormat.cpp
@@ -68,7 +68,6 @@
     case HAL_PIXEL_FORMAT_YCbCr_420_SP:
     case HAL_PIXEL_FORMAT_YCrCb_420_SP:
     case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
-    case HAL_PIXEL_FORMAT_YCrCb_420_SP_TILED:
     case HAL_PIXEL_FORMAT_YCbCr_420_P:
         info->bitsPerPixel = 12;
      done: