66 Commits

Author SHA1 Message Date
The Android Open Source Project
2c045c9893 am 88457c5c: am 3530ef81: reconcile main tree with open-source eclair
Merge commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1'

* commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1':
  android-2.1_r1 snapshot
2010-02-05 14:26:00 -08:00
The Android Open Source Project
4d9f4905a9 am 3530ef81: reconcile main tree with open-source eclair
Merge commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a' into eclair-plus-aosp

* commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a':
  android-2.1_r1 snapshot
2010-02-05 08:49:52 -08:00
The Android Open Source Project
814f64bbcb reconcile android-2.1_r1 snapshot 2010-01-29 14:09:19 -08:00
Mathias Agopian
7c6f96ceee part of fix for [2363506] [Sapphire] Video playback broken
make sure to reject incompatible buffers in special function
  GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER

we use ioctl(PMEM_GET_SIZE) to validate that the given buffer is indeed
a pmem buffer.
2010-01-20 13:22:35 -08:00
The Android Open Source Project
f1d633b78c android-2.1_r1 snapshot 2010-01-12 15:19:05 -08:00
Android Git Automerger
80b830715e Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:45 -08:00
Dima Zavin
7a3651bf1a am 57d3b368: am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20'

* commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 23:45:13 -08:00
Dima Zavin
82380f87c8 am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '6a6befc0430820ab5d837694f1b71b63c34f8b14' into eclair-mr2-plus-aosp

* commit '6a6befc0430820ab5d837694f1b71b63c34f8b14':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 18:08:20 -08:00
Dima Zavin
c96f1d6f52 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-mr2

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 17:56:59 -08:00
Mathias Agopian
449b3b0120 am 96a46011: am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '96a460114cfb663789c6990e56a17325bea1ecda'

* commit '96a460114cfb663789c6990e56a17325bea1ecda':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 17:15:30 -08:00
Mathias Agopian
e14b827d60 am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8' into eclair-mr2-plus-aosp

* commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:58:39 -08:00
Mathias Agopian
49791e47b6 am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-mr2

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:43:17 -08:00
Dima Zavin
8e3a3dc441 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-plus-aosp

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-09 21:19:13 -08:00
Dima Zavin
5844bf9d82 gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Change-Id: Ic05b895c09a55d746c737aa0c3356edc511d7c96
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-09 21:13:44 -08:00
Mathias Agopian
4e4bf04839 am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-plus-aosp

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-09 05:36:20 -08:00
Mathias Agopian
a36265815f improve cache behavior of gralloc allocations on qsd8k
make sure to use cached buffers only when frequent cpu access is needed.
also, always flush buffers after they are allocated and cleared.
2009-12-08 19:34:43 -08:00
Dima Zavin
bd01b19264 am 798bd593: am 288cb24b: am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '798bd5939d62e6c064832880830476735d9ea52d'

* commit '798bd5939d62e6c064832880830476735d9ea52d':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-07 14:57:42 -08:00
Dima Zavin
0a539ea7e9 am 4842a5ea: am 7422163d: am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb'

* commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-07 14:57:22 -08:00
Dima Zavin
af9a41610e am 288cb24b: am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268' into eclair-mr2-plus-aosp

* commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:28:16 -08:00
Dima Zavin
9d636cdcf6 am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05' into eclair-plus-aosp

* commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:26:03 -08:00
Dima Zavin
34f37bb0e8 am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05' into eclair-mr2

* commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:25:50 -08:00
Dima Zavin
42230c70df gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Change-Id: Ic41d4854d6acbc21c85a03e82bd63af234273886
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-04 20:22:41 -08:00
Dima Zavin
e4e40e9c17 am 7422163d: am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit '7422163dfcbad4997d30274bb7c438997269ae4d' into eclair-mr2-plus-aosp

* commit '7422163dfcbad4997d30274bb7c438997269ae4d':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:50:21 -08:00
Dima Zavin
9066eb552f am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c' into eclair-plus-aosp

* commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:48:32 -08:00
Dima Zavin
d547b3e2be am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c' into eclair-mr2

* commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:48:11 -08:00
Dima Zavin
deee91ac9f gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
We really need to fix this eventually, but it's not a ship blocker.

Change-Id: I35f66988e7adba13e47c2a86e13a7425cc5aada3
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-04 15:41:54 -08:00
Dima Zavin
017a0cd97e am 9f879fb0: am e817fcde: am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit '9f879fb0625bbbc117f5d6ce94451204f5fe8f04'

* commit '9f879fb0625bbbc117f5d6ce94451204f5fe8f04':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 17:21:52 -08:00
Dima Zavin
a90bb433b4 am e817fcde: am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit 'e817fcdedf46750b4ef57c8eeec0d44d5c46a252' into eclair-mr2-plus-aosp

* commit 'e817fcdedf46750b4ef57c8eeec0d44d5c46a252':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:21:01 -08:00
Dima Zavin
85ea57f975 am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-mr2

* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:16:39 -08:00
Dima Zavin
ac3595993f am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-plus-aosp

* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:16:37 -08:00
Dima Zavin
427b3ce634 libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
The GPU now correctly maps everything throug hthe MMU so physical addresses
are no longer needed.

Change-Id: Id16a690f63d7141c8ee6694b246b1955f450b8ed
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-02 21:15:33 -08:00
Mathias Agopian
3ebbc94c90 am 1a2ae2cf: am 83fb1ada: am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit '1a2ae2cf197dfc2901a42738645209e90d7c4fa2'

* commit '1a2ae2cf197dfc2901a42738645209e90d7c4fa2':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 15:02:30 -08:00
Mathias Agopian
f82c9d5f4a am 83fb1ada: am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit '83fb1ada26d894c807686a93925c1e255fddb28c' into eclair-mr2-plus-aosp

* commit '83fb1ada26d894c807686a93925c1e255fddb28c':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 14:53:09 -08:00
Mathias Agopian
e31aa77918 am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e' into eclair-plus-aosp

* commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 14:43:44 -08:00
Mathias Agopian
c8b68c1868 am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e' into eclair-mr2

* commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 14:43:43 -08:00
Mathias Agopian
c73e6963a9 part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Add support for 32 bits framebuffers
2009-11-23 23:19:54 -08:00
Jean-Baptiste Queru
b440b346da am ae89e9cd: merge from open-source master
Merge commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9'

* commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9':
  eclair snapshot
2009-11-15 15:10:02 -08:00
Jean-Baptiste Queru
1599ad51cd merge from open-source master 2009-11-15 14:55:21 -08:00
Jean-Baptiste Queru
5c524a2a13 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:34 -08:00
Jean-Baptiste Queru
816cd5a360 eclair snapshot 2009-11-12 18:46:07 -08:00
Mathias Agopian
3a7373acb2 am e3c65ac1: am f4a09d74: am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad'

* commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad':
  fix[2222341] Soft reset while going back from camcorder settings
2009-11-01 21:55:12 -08:00
Mathias Agopian
e339b1c6a9 am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975' into eclair-mr2

* commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:02:10 -07:00
Mathias Agopian
288ce91925 fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger

also make sure to not send empty rectangles to the MDP.
2009-10-30 14:52:52 -07:00
Patrick Scott
b3b31f0179 am d9b1ab0b: am 7930a644: Merge change I5d43ba27 into eclair-mr2
Merge commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276'

* commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276':
  Remove calls to dump_l.
2009-10-30 05:35:49 -07:00
Patrick Scott
99f6e19f71 Remove calls to dump_l.
This fails to compile without NDEBUG and the log statement is accomplishing the
same thing.
2009-10-29 08:35:22 -04:00
Dima Zavin
2e18b56e5b am a6537357: gralloc-qsd8k: Call glFinish on composition complete.
Merge commit 'a653735759df4b8338475d79044c6494b238e681'

* commit 'a653735759df4b8338475d79044c6494b238e681':
  gralloc-qsd8k: Call glFinish on composition complete.
2009-10-13 11:53:11 -07:00
Dima Zavin
373ca4b021 gralloc-qsd8k: Call glFinish on composition complete.
Change-Id: I09c8287bcaf89f3f8bcaa4108631641a0fcc397b
Signed-off-by: Dima Zavin <dima@android.com>
2009-10-08 01:13:51 -07:00
Simon Wilson
3977a0d336 am a2a01e7b: Enforce 32 pixel alignment for Adreno 200
Merge commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4'

* commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4':
  Enforce 32 pixel alignment for Adreno 200
2009-08-25 14:26:29 -07:00
Simon Wilson
95b0dca41e Enforce 32 pixel alignment for Adreno 200 2009-08-25 14:01:36 -07:00
Mathias Agopian
733093e777 am e84bc637: fix gralloc qsd8k. we actually don\'t need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
Merge commit 'e84bc637603d34b11a35658a7dbb511bc76aebda'

* commit 'e84bc637603d34b11a35658a7dbb511bc76aebda':
  fix gralloc qsd8k. we actually don't need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
2009-08-20 16:56:10 -07:00