am bcd5273d: am 072b5f0d: Merge change I42e2860a into eclair

Merge commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7' into eclair-mr2-plus-aosp

* commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7':
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
This commit is contained in:
Mathias Agopian 2009-11-11 17:28:53 -08:00 committed by Android Git Automerger
commit 2376dcc6f6

View File

@ -42,8 +42,10 @@
#if defined(COPYBIT_MSM7K)
#define MAX_SCALE_FACTOR (4)
#define MAX_DIMENSION (4096)
#elif defined(COPYBIT_QSD8K)
#define MAX_SCALE_FACTOR (8)
#define MAX_DIMENSION (2048)
#else
#error "Unsupported MDP version"
#endif
@ -366,6 +368,12 @@ static int stretch_copybit(
return -EINVAL;
}
if (src->w > MAX_DIMENSION || src->h > MAX_DIMENSION)
return -EINVAL;
if (dst->w > MAX_DIMENSION || dst->h > MAX_DIMENSION)
return -EINVAL;
const uint32_t maxCount = sizeof(list.req)/sizeof(list.req[0]);
const struct copybit_rect_t bounds = { 0, 0, dst->w, dst->h };
struct copybit_rect_t clip;