summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* intel: hwcomposer: Only use DRM_PSB_PM_SET if it existsHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Christopher R. Palmer2016-03-141-0/+16
| | | | | | | | Older devicds don't have this ioctl in their kernels and need to rely on the older calls. Conditionally restore them after the merge of 6.0.1_r22. Change-Id: I9ac7b015b1d039095cbc84867ef8d7dc2a74324c
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-118-22/+35
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/hardware/intel/img/hwcomposer into cm-13.0 Android 6.0.1 release 22 Change-Id: I70129e3d6e384284617d8d45fcf783f350e0c54d
| * Use default csc mode and video range setting for HDMI. Update ↵mahongpe2015-12-092-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | VideoPayloadBuffer to align with palyload in video driver am: f65be044ae * commit 'f65be044aecd54f462dd0f42b07c238fd3c4aab5': Use default csc mode and video range setting for HDMI. Update VideoPayloadBuffer to align with palyload in video driver
| | * Use default csc mode and video range setting for HDMI.mahongpe2015-12-082-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update VideoPayloadBuffer to align with palyload in video driver Bug: 25936176 Change-Id: I5b0ad4d7aa107f4dc4ecca38659ec94c3799447e Signed-off-by: mahongpe <hongpeng.ma@intel.com>
| * | IMG HWC: DDK1.5 upgrade for MerrifieldVictor Tasayco Loarte2015-12-0310-245/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on following patches: https://android.intel.com/#/c/394225/ https://android.intel.com/#/c/408229/ https://android.intel.com/#/c/394226/ Change-Id: Iead2940d0f033b3a0c91a42a58dc9898ae5cb6ec Orig-Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-43707 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1017 Signed-off-by: Jia, Lin A <lin.a.jia@intel.com> Signed-off-by: Tong, Bo <box.tong@intel.com> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
| * | hwc: Enabling ION - HWCVictor Tasayco Loarte2015-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling a libwsbm function with fd value (-1) Orig-Author: Randy Xu <randy.xu@intel.com> Change-Id: Ie3a5765faca3f71c58ba604bd96d2e88261eb616 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1017 Signed-off-by: Dale Stimson <dale.b.stimson@intel.com> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
| * | DrmConfig: Change DRM_MODE_ENCODER_MIPI to DRM_MODE_ENCODER_DSIVictor Tasayco Loarte2015-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | To be consistent with upstream naming. Change-Id: I69bfcc3cfdbbb222a01f16323e2ea468f5916cc7 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1012 Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
| * | Fix M Upgrade Compilation issuesVictor Tasayco Loarte2015-12-032-5/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: I24113f420e1180dbaf03efc3af2181cd6dd7eaf5 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1012 Signed-off-by: Stephen Woo <stephen.m.woo@intel.com> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
| * | am 219b6962: Display: power consumption savingSaadi Maalem2015-08-191-11/+13
| |\ \ | | | | | | | | | | | | | | | | * commit '219b6962f08cc66bd6227f4647388c26f486a4dd': Display: power consumption saving
| | * | Display: power consumption savingSaadi Maalem2015-08-131-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIRA: MARVIN-142 implement hwc setPowerMode for display power saving. Change-Id: Ia7c5d3da733f674cbb977fc443cd17c0cf81a2f8 Signed-off-by: Sophia Gong <sophia.gong@intel.com> Reviewed-on: https://android.intel.com/386435 Tested-by: Ledentec, AlexandreX <alexandrex.ledentec@intel.com> Reviewed-by: Maalem, Saadi <saadi.maalem@intel.com>
| * | | am 040739ae: Hwcomposer: Enable VirtualDisplay featureSaadi Maalem2015-08-1910-59/+93
| |\| | | | | | | | | | | | | | | | | | * commit '040739aeaee679e4a570d51d8c081c61b7da3271': Hwcomposer: Enable VirtualDisplay feature
| | * | Hwcomposer: Enable VirtualDisplay featureSaadi Maalem2015-08-1310-59/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIRA: MARVIN-68 Fixed fd leaks issues with VirtualDisplays. Due to removal of WIDI, the VirtualDisplay feature got removed and we end up with a file descriptor leakage when using extensively the VirtualDisplay feature. Add back VirtualDisplay feature without WIDI support. Change-Id: Ief60aac960585c0f09312e2cc7e5629969f3f448 Signed-off-by: Liang Weilong <weilongx.liang@intel.com> Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com> Reviewed-on: https://android.intel.com/380907 Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com> Reviewed-by: Liu, Kevin <kevin.liu@intel.com> Reviewed-by: jenkins_ndg <jenkins_ndg@intel.com> Reviewed-by: Akue, LoicX <loicx.akue@intel.com> Reviewed-by: Ledentec, AlexandreX <alexandrex.ledentec@intel.com> Reviewed-by: Maalem, Saadi <saadi.maalem@intel.com> Tested-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
| * | | am 59b4d767: Set proper blanking mode for DOZEVictor Tasayco Loarte2015-08-190-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '59b4d76727d3ed68dcadb018c121b6b9d80cfb7b': Set proper blanking mode for DOZE
| | * | Set proper blanking mode for DOZEVictor Tasayco Loarte2015-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support Ambient mode with new HWC 1.4 coming with Diamond, blanking mode should properly set in setPowerMode implementation. When setting HWC_POWER_MODE_DOZE, display should not blank as other modes with display on (HWC_POWER_MODE_NORMAL & HWC_POWER_MODE_DOZE_SUSPEND). Change-Id: I24409ea6e57159c10fb425de0b66ba334810118f Tracked-On: https://jira01.devtools.intel.com/browse/MARVIN-650 Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com> Reviewed-on: https://android.intel.com:443/370542
| * | | Set proper blanking mode for DOZEVictor Tasayco Loarte2015-07-301-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support Ambient mode with new HWC 1.4 coming with Diamond, blanking mode should properly set in setPowerMode implementation. When setting HWC_POWER_MODE_DOZE, display should not blank as other modes with display on (HWC_POWER_MODE_NORMAL & HWC_POWER_MODE_DOZE_SUSPEND). Change-Id: I24409ea6e57159c10fb425de0b66ba334810118f Tracked-On: https://jira01.devtools.intel.com/browse/MARVIN-650 Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com> Reviewed-on: https://android.intel.com:443/370542
* | | Merge tag 'android-6.0.1_r13' into 13.0Jessica Wagantall2016-02-010-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 release 13 Ticket: CYNGNOS-1522 Change-Id: Ief9a785595e265db831238c8333307a9fdf05ea8
| * | | Use default csc mode and video range setting for HDMI.mahongpe2015-12-172-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update VideoPayloadBuffer to align with palyload in video driver Bug: 25936176 Change-Id: I5b0ad4d7aa107f4dc4ecca38659ec94c3799447e Signed-off-by: mahongpe <hongpeng.ma@intel.com>
| * | | merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-170-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | Merge "HWC: adapt VirtualDevice for old blob compliance" into cm-13.0stable/cm-13.0-ZNH0EChristopher R. Palmer2016-01-131-2/+2
|\ \ \ \
| * | | | HWC: adapt VirtualDevice for old blob complianceJason Riordan2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie5d67e54b8d9ed18b7bbeda0dfcb0b7a64226688
* | | | | Merge "Hwcomposer: Enable VirtualDisplay feature" into cm-13.0Christopher R. Palmer2016-01-1310-59/+93
|\| | | |
| * | | | Hwcomposer: Enable VirtualDisplay featureSaadi Maalem2016-01-0710-59/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIRA: MARVIN-68 Fixed fd leaks issues with VirtualDisplays. Due to removal of WIDI, the VirtualDisplay feature got removed and we end up with a file descriptor leakage when using extensively the VirtualDisplay feature. Add back VirtualDisplay feature without WIDI support. Change-Id: I7718222f88eb765ed110afe71f1f496e66a23cfd Signed-off-by: Liang Weilong <weilongx.liang@intel.com> Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com> Reviewed-on: https://android.intel.com/380907 Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com> Reviewed-by: Liu, Kevin <kevin.liu@intel.com> Reviewed-by: jenkins_ndg <jenkins_ndg@intel.com> Reviewed-by: Akue, LoicX <loicx.akue@intel.com> Reviewed-by: Ledentec, AlexandreX <alexandrex.ledentec@intel.com> Reviewed-by: Maalem, Saadi <saadi.maalem@intel.com> Tested-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
* | | | | intel: hwcomposer: csc mode is only supported on newer blobsChristopher R. Palmer2016-01-131-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Idda66fe019a6fab461b791ae67e6491127f7c762
* | | | | intel: hwcomposer: Use ASUS_ZENFONE2_LP_BLOBS insteadChristopher R. Palmer2016-01-134-8/+4
|/ / / / | | | | | | | | | | | | Change-Id: I3b8776cc2b697902581de92071368d313870feb0
* | | | Merge tag 'android-6.0.1_r10' into HEADJessica Wagantall2016-01-052-2/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Ticket: CYNGNOS-1404 Android 6.0.1 release 10
| * | | Use default csc mode and video range setting for HDMI.mahongpe2015-12-152-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Update VideoPayloadBuffer to align with palyload in video driver Bug: 25936176 Change-Id: I5b0ad4d7aa107f4dc4ecca38659ec94c3799447e Signed-off-by: mahongpe <hongpeng.ma@intel.com>
* | | Revert "Hwcomposer Moorefield: Return DummyDevice for TERTIARY display"Christopher R. Palmer2016-01-012-3/+0
| | | | | | | | | | | | | | | | | | This reverts commit d1d49956ed8cfe4c2363670a3d019c52a4128f8c. Change-Id: Ie56fcf9d30f9f4cdc0b2cb9e882db47637a13a3b
* | | hwc: merrifield_plus: Add legacy LP blob supportChristopher R. Palmer2015-12-194-0/+174
| | | | | | | | | | | | Change-Id: Ifba18a8d2f631930e85c540f397c46b7119eea14
* | | hwc: Use the proper define for the primary displayChristopher R. Palmer2015-12-191-2/+2
| | | | | | | | | | | | Change-Id: I3176dca060d8d8b4f7381c5571610ce60778a3c0
* | | hwc: Enabling IONChristopher R. Palmer2015-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying this to moorefield commit 97499e0e66f97479df3f50345616e324f9ad3644 Author: Vinil Cheeramvelil <vinil.cheeramvelil@intel.com> Date: Wed Sep 10 06:29:33 2014 +0800 hwc: Enabling ION - HWC Calling a libwsbm function with fd value (-1) Orig-Author: Randy Xu <randy.xu@intel.com> Bug: 18731042 BZ: 230505 Change-Id: I6a7a218c7fd6a5af6f4e0eea9cfef1ffca6752db Signed-off-by: Dale Stimson <dale.b.stimson@intel.com> Change-Id: I308cacbfd86b340f4d8e486d4cde7ec556f60d3b
* | | Update HWC interfaceChristopher R. Palmer2015-12-1913-251/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a port of this commit: commit bacdfbde97131d12c92bf832ce9d7db6de4598d8 Author: Vinil Cheeramvelil <vinil.cheeramvelil@intel.com> Date: Tue Jun 2 15:23:47 2015 -0700 IMG DDK1.5 HWC update: replace broken Intel HWC interface Bug: 20914944 Bug: 20302101 Bug: 19412176 Bug: 21265944 Change-Id: I346848e040bf869d9e84016c05dd136f1cee397b Signed-off-by: Pradeep Radhakrishna <pradeep.radhakrishna@intel.com> which also included removing "filter" from the blit method of the BufferManager. Change-Id: Ib536dcc61f29eecfd954885ae5f5dab54507d911
* | | Update #define syntax for string concatenationChristopher R. Palmer2015-11-101-5/+5
| | | | | | | | | | | | Change-Id: I50a7b4d0d423cbf6349909f6b44ded7c42704c20
* | | Hwcomposer Moorefield: Return DummyDevice for TERTIARY displaydhacker292015-11-062-0/+3
|/ / | | | | | | | | | | | | HWC_DISPLAY_TERTIARY was added by caf, we don't use it so just return the DummyDevice Change-Id: I170f8bcd3ffc1bf069aecb7b0bf06b4aa9a29d17
* | Fall back to GLES composition when playing 180 degree rotated videoJia, Lin A2015-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | When playing 180 degree rotated video, fall back to GLES composition to avoid video blanck issue. Bug: 21551651 Change-Id: Ibca4c48dc40c7ced705f45ac75a9f314932219c5 Signed-off-by: Jia, Lin A <lin.a.jia@intel.com>
* | IMG DDK1.5 HWC update: replace broken Intel HWC interfaceVinil Cheeramvelil2015-06-168-270/+376
| | | | | | | | | | | | | | | | | | Bug: 20914944 Bug: 20302101 Bug: 19412176 Bug: 21265944 Change-Id: I346848e040bf869d9e84016c05dd136f1cee397b Signed-off-by: Pradeep Radhakrishna <pradeep.radhakrishna@intel.com>
* | hwc: Enabling ION - HWCVinil Cheeramvelil2015-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | Calling a libwsbm function with fd value (-1) Orig-Author: Randy Xu <randy.xu@intel.com> Bug: 18731042 BZ: 230505 Change-Id: I6a7a218c7fd6a5af6f4e0eea9cfef1ffca6752db Signed-off-by: Dale Stimson <dale.b.stimson@intel.com>
* | hwc: set csc mode in hwcNana Guo2015-06-093-0/+59
| | | | | | | | | | | | | | BZ: IMINAN-37403 Change-Id: I07686698296f6712dc3e8dfc086499767460ab03 Signed-off-by: Nana Guo <nana.n.guo@intel.com>
* | Detect scale rate for interlace streamJia, Lin A2015-06-081-0/+8
| | | | | | | | | | | | | | | | | | Fall back to GLES if interlace stream exceed to the limitation to avoid video display quality issue. Bug: 20933701 Change-Id: I653440d9403869d045c1627041facb8f47cd6ae3 Signed-off-by: Jia, Lin A <lin.a.jia@intel.com>
* | Add support for hotplug events on primary displayMichael Lentine2015-05-2214-38/+38
| | | | | | | | | | | | | | | | | | | | Remove the ifdefs protecting hotplug from being called. Fix Hwcomposer to use the display index instead of the display type when sending a hotplug event. Bug: 18698244 Change-Id: I32582c23323e409ca602db86d297c406e4010da9
* | Stop using stlport.Dan Albert2015-05-081-6/+0
| | | | | | | | | | | | Bug: http://b/15193147 Change-Id: Ie58c5a85b5510fd02899e4b0e003b8b248192b65 (cherry picked from commit 65fa7189d02eedb7d882bbf5190ca7b92163ee49)
* | Reuse existing frame buffer during mode setting if display resolution is not ↵Andy Qiu2015-05-013-46/+37
| | | | | | | | | | | | | | | | | | changed. Bug: 18619361 Change-Id: I3d8cb770ead51eb19979f179d408da50b6c02236 Signed-off-by: Andy Qiu <junhai.qiu@intel.com>
* | Update interlace register in backbuffer when stream changesTianmi Chen2015-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | Interlace bit in backbuffer should be updated when switch from interlace video to progressive video if they are in one stream. In this case, ANativeWindows are the same. Bug: 19576398 Change-Id: Ibfa6ab6757c3073e5f603c5806350821be5da812 Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>
* | am 19524180: (-s ours) am a584a96a: moorefield_hdmi: change ↵Patrick Tjin2015-04-170-0/+0
|\ \ | | | | | | | | | | | | | | | | | | INTEL_HWC_MOOREFIELD to _HDMI [DO NOT MERGE] * commit '1952418042913922229d97889b88a35d4434a0da': moorefield_hdmi: change INTEL_HWC_MOOREFIELD to _HDMI [DO NOT MERGE]
| * | am a584a96a: moorefield_hdmi: change INTEL_HWC_MOOREFIELD to _HDMI [DO NOT ↵Patrick Tjin2015-04-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | MERGE] * commit 'a584a96a918bb1b5f47a9f274405f00f38064fb6': moorefield_hdmi: change INTEL_HWC_MOOREFIELD to _HDMI [DO NOT MERGE]
| | * moorefield_hdmi: change INTEL_HWC_MOOREFIELD to _HDMI [DO NOT MERGE]Patrick Tjin2015-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change INTEL_HWC_MOOREFIELD to INTEL_HWC_MOOREFIELD_HDMI since there is now a non-HDMI HWC which is using INTEL_HWC_MOOREFIELD. Change-Id: Ice1bce3ed3f4eb95e3051f468619cfd1311e1373 Signed-off-by: Patrick Tjin <pattjin@google.com> (cherry picked from commit ccd45aee04a3a41d3853f297de08e9b36736b9df)
* | | moorefield_hdmi: change INTEL_HWC_MOOREFIELD to _HDMIPatrick Tjin2015-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change INTEL_HWC_MOOREFIELD to INTEL_HWC_MOOREFIELD_HDMI since there is now a non-HDMI HWC which is using INTEL_HWC_MOOREFIELD. Change-Id: Ice1bce3ed3f4eb95e3051f468619cfd1311e1373 Signed-off-by: Patrick Tjin <pattjin@google.com>
* | | am 5edf645c: am 3f021f91: am 5094bbf4: Moving Moorefield HWComposer in ↵Guilhem IMBERTON2015-04-10105-0/+0
|\| | | | | | | | | | | | | | | | | | | | dedicated directory * commit '5edf645c075c95db98669b150c1d3c22c4bf30bd': Moving Moorefield HWComposer in dedicated directory
| * | am 3f021f91: am 5094bbf4: Moving Moorefield HWComposer in dedicated directoryGuilhem IMBERTON2015-04-10105-0/+0
| |\| | | | | | | | | | | | | * commit '3f021f9136639ae37de057ac74e5bc74b37e0fd6': Moving Moorefield HWComposer in dedicated directory
| | * am 5094bbf4: Moving Moorefield HWComposer in dedicated directoryGuilhem IMBERTON2015-04-10105-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '5094bbf4cbe9b244d79ce5ec52a9285978fff311': Moving Moorefield HWComposer in dedicated directory
| | | * Moving Moorefield HWComposer in dedicated directoryGuilhem IMBERTON2015-04-09105-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fugu HWComposer has been widely modified to fit HDMI only. The current version does not support Marvin product based on Merrifield platform. We are moving both HWComposer to dedicated folders as a first integration step. Merge will happen later. Change-Id: Iebe90a7bd95c017eca63310fd23b32d53dfccb72 Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 05:28:25 +0000