34 Commits

Author SHA1 Message Date
Mathias Agopian
1bb185f048 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
f29f87165d 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
0c996e6cf0 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
2b157b50ec 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
acea59fb03 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
94544b042f merge from open-source master 2009-11-15 14:55:21 -08:00
Jean-Baptiste Queru
3e9fb8aebe merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:34 -08:00
Jean-Baptiste Queru
9ed70ab65c eclair snapshot 2009-11-12 18:46:07 -08:00
Mathias Agopian
5378880a09 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
00b3a1ee65 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
17ec593984 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
63f40fe016 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
d246c3b763 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
828afc6044 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
e3a54b6a92 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
0b6cd996cb 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
239f3ecb59 Enforce 32 pixel alignment for Adreno 200 2009-08-25 14:01:36 -07:00
Mathias Agopian
ba1a0a0f41 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
Mathias Agopian
6c0ad4845a fix gralloc qsd8k. we actually don't need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
this module is now closer to the generic gralloc module, although it will have to evolve in the near future.
2009-08-20 15:41:34 -07:00
Mathias Agopian
103bbc0e62 am bef85866: use the same magic value for native_handle in 7k and 8k, since the handles are actually identical
Merge commit 'bef8586620c3d4f74d6f624804253f70cf5fd767'

* commit 'bef8586620c3d4f74d6f624804253f70cf5fd767':
  use the same magic value for native_handle in 7k and 8k, since the handles are actually identical
2009-08-19 16:49:39 -07:00
Mathias Agopian
b8b04a26b1 am e7d05d5e: make gralloc_priv.h for msm7k and qsd8k identical and C friendly
Merge commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd'

* commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd':
  make gralloc_priv.h for msm7k and qsd8k identical and C friendly
2009-08-19 16:49:36 -07:00
Mathias Agopian
3292f22159 am ad641e7d: reenabled partial updates in msm7k/qsd8k
Merge commit 'ad641e7dda01a1fc787ee55e868344dce2c26fdb'

* commit 'ad641e7dda01a1fc787ee55e868344dce2c26fdb':
  reenabled partial updates in msm7k/qsd8k
2009-08-19 16:49:35 -07:00
Mathias Agopian
eb3bbc45f8 am 79c9ceea: make gralloc-qsd8k closer to the generic gralloc so it\'s easier to maintain
Merge commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f'

* commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f':
  make gralloc-qsd8k closer to the generic gralloc so it's easier to maintain
2009-08-19 16:49:32 -07:00
Mathias Agopian
eaed4b29a5 use the same magic value for native_handle in 7k and 8k, since the handles are actually identical 2009-08-19 15:16:48 -07:00
Mathias Agopian
52b53535f3 make gralloc_priv.h for msm7k and qsd8k identical and C friendly 2009-08-19 14:17:17 -07:00
Mathias Agopian
4a811d3c28 reenabled partial updates in msm7k/qsd8k 2009-08-19 13:45:02 -07:00
Mathias Agopian
fa0e4398d8 make gralloc-qsd8k closer to the generic gralloc so it's easier to maintain 2009-08-19 13:14:55 -07:00
Dima Zavin
b8d8e9f138 Fix merge for changes that were both in master and eclair
Merge commit '870718f0c3e27c9311e0c666059af16b34209509'
2009-08-13 19:12:20 -07:00
Dima Zavin
b23c7c8b9f gralloc8k: make sure to set the physical address of the framebuffer
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:21 -07:00
Dima Zavin
6dc27dcf9a gralloc8k: fix partial updates, some cleanups
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:19 -07:00
Dima Zavin
ac0d3774db qsd8k: add gralloc for 8k
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:18 -07:00
Dima Zavin
ec1808cf63 gralloc8k: make sure to set the physical address of the framebuffer
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:28 -07:00
Dima Zavin
490a8987e8 gralloc8k: fix partial updates, some cleanups
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:28 -07:00
Dima Zavin
80feffee95 qsd8k: add gralloc for 8k
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:27 -07:00