summaryrefslogtreecommitdiff
path: root/drivers/video
AgeCommit message (Collapse)Author
2011-08-19video: tegra: nvmap: single page allocation policy correctedKirill Artamonov
When user doesn't use default heap policy and selects GART or carveout allocation, automatic single-page-to-sysmem rule doesn't work. Because of broken rule many single page allocations take extra space in carveout and create unnecessary page mappings in GART and SMMU. The fix adds sysmem bit to heap mask when allocation is single page and GART or carveout is present in heap mask. bug 730124 bug 731923 The change also does sanity check of available system memory before adding sysmem bit for carveout allocations. bug 777839 Reviewed-on: http://git-master/r/31383 (cherry picked from commit 502c2becc54b49d26371f9b167f0c6f82a1bc37f) Bug 844307 Conflicts: drivers/video/tegra/nvmap/nvmap_handle.c Reviewed-on: http://git-master/r/38429 (cherry picked from commit ddfc93d27830a28a1c9786fd5bce6dc35727e9ff) Change-Id: I9b8f84a5a7daf192d1d412926f91e5de71938818 Reviewed-on: http://git-master/r/47829 Reviewed-by: Andre Sihera <asihera@nvidia.com> Tested-by: Andre Sihera <asihera@nvidia.com> Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-08-11video: tegra: overlay: Adding H/V flip supportMarkus Holtmanns
Overlays can now be horizontally or vertically flipped. Bug 834182 Bug 794998 Change-Id: I2a3bf43ba15b9917bf3cfa0cef3c9bb0769948d3 Reviewed-on: http://git-master/r/46012 Reviewed-by: Bo Kim <bok@nvidia.com> Tested-by: Bo Kim <bok@nvidia.com> Reviewed-by: Michael Frydrych <mfrydrych@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-08-10video: tegra: fix divide by zero exception in hdmi moduleSanjay Singh Rawat
Bug 851086 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/40788 (cherry picked from commit 835196496da8c426d1a7d6342faf525c900ea81f) Change-Id: Ic7d1a4fba87ae03fab344039b1de5a6f7c15f3e6 Reviewed-on: http://git-master/r/42382 Reviewed-by: Youngjin Kim <nkim@nvidia.com> Reviewed-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-08-02video: tegra: dc: fix hdmi mode filterDonghan Ryu
If there are more than one hdmi modes that have same xres, yres, and vmode, tegra_dc_hdmi_mode_equal can return true even though pixclocks are way different from each other. Now, tegra_dc_hdmi_mode_equal will retun false if pixclock has more than 1Hz of difference. Also, tegra_fb_set_par will use fb_find_nearest_mode instead of fb_find_best_mode to take refresh rate into the consideration. Bug: 815409 Reviewed-on: http://git-master/r/36464 (cherry picked from commit 8cf6e47dd3d4efaa3a1f0a15f1bd36ad34d3a951) Change-Id: I14fbfba832bd130c7f04369b360d48fbbfad3d7b Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/43655 Reviewed-by: Manish Tuteja <mtuteja@nvidia.com> Tested-by: Manish Tuteja <mtuteja@nvidia.com>
2011-08-01video: tegra: dc: use a delayed_work on hdcpDonghan Ryu
hdmi modeset triggers to re-start hdcp and trying to negotiate too early can cause HDCP failure. using delayed_work can avoid this situation by starting HDCP a little bit late Bug 855002 Change-Id: I607d31c80b57c4e76dc34d2b19d1d8e9cebe4b8f Reviewed-on: http://git-master/r/43692 Reviewed-by: Donghan Ryu <dryu@nvidia.com> Tested-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-07-28video: tegra: dc: fix delay on hdmi modesetDonghan Ryu
wait_event_interruptible_timeout checks the condition before it enters a sleep. Adding a real condition to the function avoids an un-wanted aditional sleep. Bug 833476 Reviewed-on: http://git-master/r/43225 Reviewed-on: http://git-master/r/43426 (cherry picked from commit 40a95f668b311b66212cf81638bb65f241835e98) Change-Id: I46ebab6229d24d0977e1ce640bdec9611df621e7 Reviewed-on: http://git-master/r/43610 Reviewed-by: Donghan Ryu <dryu@nvidia.com> Tested-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-07-27fbdev: Fix fb_find_nearest_mode refresh comparisonDonghan Ryu
Refresh rate nearness is not calculated or reset when nearest resolution changes. This patch resets the refresh rate differential measurement whenever a new nearest resolution is discovered. This fixes two error cases; first, wherein the first mode's refresh rate differential is never calculated and second, when the closest refresh rate from a previous nearest resolution is erroneously preserved. back-ported from kernel.org (cherry picked from commit 8917a5603a3e6534d6c75ed0d91077062805b111) Reviewed-on: http://git-master/r/37417 (cherry picked from commit a169b1a92dc1ed4c824569e9dc70267cb1e2eb52) Change-Id: I9757e98053a0676491dfe943f06a0c4946ef96be Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/42390 Reviewed-by: Donghan Ryu <dryu@nvidia.com> Tested-by: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-26arm: tegra: correct 3D power gate WAR.Roger Hsieh
3D power gate should be always disabled to keep the power. Set T20 enabled by default. Bug 843271 Change-Id: Icf464cd107e65636440f8103ac6b104e2939e8b9 Reviewed-on: http://git-master/r/40342 Reviewed-on: http://git-master/r/43175 Reviewed-by: David Schalig <dschalig@nvidia.com> Tested-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-25ARM: tegra: dc: Disable EDID dumpArtiste Hsu
tegra_edid_dump() causes audio noise when plugin HDMI cable during video playback and should not be enabled by default. Bug 837728 Reviewed-on: http://git-master/r/42006 (cherry picked from commit 02bedac446b3951e9d5a34f1be97ca3918d80821) Change-Id: I3298f5a98245fc9c3561b3a62a496dcf452280f5 Reviewed-on: http://git-master/r/42311 Tested-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-by: ChihJen Hsu <chhsu@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-22tegra: fb: HDMI monitor spec. not correct via "mode" device.Andre Sihera
When monitor is auto-detected on HDMI port, a special structure is initialised to hold the video mode properties for the plugged- in monitor. From this the display string is generated for displa via the "mode" character device under /sys. When the monitor is disconnected, the structures associated with the monitor tself are cleared, but the pointer to the video mode properties structure was left initialised and so pointed into thin air, which resulted in garbage appearing on the "mode" device. Added explicit deinitialisation code to reset pointer to video mode properties so "cat mode" within /sys yields an empty string when the HDMI monitor is unplugged. Bug 849877 Change-Id: Idbd3f308ee0ee466f7aba0af9aac7e60af72b7fd Reviewed-on: http://git-master/r/41205 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
2011-07-22video: tegra: host: change acm timeout to 40 msWen Yi
The cursor in Android application flashes about 1 hz and the duty cycle for this kind of 3D activity should be far smaller than 1 second. To save power set acm timeout to 25 ms. 40 ms (4 in jiffies) is selected to prevent jitter of 30 fps video capture. BUG 824299 (cherry picked from http://git-master/r/31905) Change-Id: Ibab9949d18c464119886ecefa016fbb963eeb2b7 Reviewed-on: http://git-master/r/37279 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Sun Kyu Choi <sunkyuc@nvidia.com> Reviewed-by: Joshua Cha <joshuac@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-22video: tegra: check for hdmi peripheral during resumeSanjay Singh Rawat
As HDMI is not a wakeup source. To detect HDMI peripheral which is connected after suspend, we scan for it during HDMI resume. Bug 846365 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/39776 (cherry picked from commit fd1134f413845f8e0b3944153eb7406f713a9709) Change-Id: Ifcdeb340d953b288bdfee224f3b0f0f3caab98c1 Reviewed-on: http://git-master/r/40808 Tested-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-21Revert "video: tegra: add mmap support for framebuffer"vidyasagar
This reverts commit 2b96783fd25eb2153cab2fb6ff92b2bacc809bed. Recovery process is hanging because of this change. Bug 848403 Bug 800107 Change-Id: I1b7d3f6c08d6db40eda077e5f128c4bf3be681ac Reviewed-on: http://git-master/r/41818 Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Kaushik Sen <ksen@nvidia.com> Reviewed-by: Joseph Lehrer <jlehrer@nvidia.com> Tested-by: Joseph Lehrer <jlehrer@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-07-11video: tegra: dc: Reduce usage count of nvmap clientVandana Salve
Carveout memory leak occured in video playback on abnormal termination as the tegra overlay driver didn't had the implementation to reduce the usage count of nvmap client on device closure. Hence on abnormal termination of mediaserver, the carveout memory remained allocated causing memory leak. The usage count of nvmap client for overlay driver is incremented on ioctl TEGRA_OVERLAY_IOCTL_SET_NVMAP_FD.It should be decremented on device closure. Added the code to decrement the uage count of nvmap client on release, so that the client and the carveout memory is free'd whenever the count reaches zero on successful as well as abnormal termination of mediaserver process. Similar implementation is done by NvHost channel driver, The NvHost drivers takes care of nvmap client usage count.i.e. decrement the uasge count of nvmap client which is incremented by NVHOST_IOCTL_CHANNEL_SET_NVMAP_FD ioctl. Bug 845676 Change-Id: I17b8d3c34adba5352af61355d8648b2611b62ef2 Reviewed-on: http://git-master/r/40157 Tested-by: Vandana Salve <vsalve@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-07-11video: tegra: add mmap support for framebuffertegra-10.11.11Nitin Kumbhar
fb_mmap maps current window so that content of screen is accessible through mmap sys call to user space components. BUG 832288 Change-Id: I10ccb0b70c951f6d43dbd8a7a1e59e86c0ee75e9 Reviewed-on: http://git-master/r/39204 Reviewed-by: Manish Tuteja <mtuteja@nvidia.com> Tested-by: Manish Tuteja <mtuteja@nvidia.com>
2011-07-07nvrm: wrong comparision to trigger BUG_ON()BK Kim
BUG_ON() function has wrong comparision. the comparision should be '>='. (not '>') Change-Id: I39453cc02615236b52aa04be076184da35df8e94 Reviewed-on: http://git-master/r/39503 Reviewed-by: BK Kim <bkk@nvidia.com> Tested-by: BK Kim <bkk@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-29video: tegra: Skip syncpoint increments if disabledYu-Huan Hsu
Avoid Display Controller (DC) syncpoint increments if that instance of DC is not enabled. Bug 793874 (cherry picked from commit 5be1dd4dd04db4a4c4e8004e364d504bf9f56857) Change-Id: I91f05694044bbefb15c3b92047be3be47b2ceacc Reviewed-on: http://git-master/r/38464 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
2011-06-29ARM: tegra: dc: fix deadlock on overlay wq flushJon Mayo
dc lock is head while flush occurred, but functions called by workers need take the dc lock to proceed. Bug 807015 (cherry picked from commit 2e12d89ac51fe1358f0b01b9ff5cb4978fdcbe9d) Change-Id: Ib358685c478c05a8f95c926e708de12b6a3556fb Reviewed-on: http://git-master/r/38463 Reviewed-by: Linqiang Pu <dpu@nvidia.com> Tested-by: Linqiang Pu <dpu@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-06-24video: tegra: Do not set HDMI as a wakeup sourceSanjay Singh Rawat
HDMI connect/disconnect will not affect the suspended device. bug 835157 Change-Id: Ie094a2dcebdca2e405f3e02b4de3d12d0cb665f0 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/37174 (cherry picked from commit 31f69bbe2e832a7dfa7678bb965b3461f421e0f5) Reviewed-on: http://git-master/r/38089 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-06-24tegra: fix warning arguments count mismatchAlexandre Courbot
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Change-Id: I32755368de7059a8aa08b114af84d952adf16a1d Reviewed-on: http://git-master/r/37981 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-24video: tegra: add 504MHz pll_d rate for HDMIJoseph Lehrer
To support the 25.2MHz pixel clock frequency required for CEA-861-B format 1: 640x480p at 59.94Hz bug 837571 Change-Id: I33d5c82bbc9c79fd43d86abf72d5b94b1c723dd5 Reviewed-on: http://git-master/r/37916 Reviewed-by: Joseph Lehrer <jlehrer@nvidia.com> Tested-by: Joseph Lehrer <jlehrer@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-06-24tegra: dc: fix compilation with lock debuggingAlexandre Courbot
Fix incorrect invocation of mutex_destroy that results in a compile error if mutex debugging features are enabled. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Change-Id: I4f5ce4406e11b94d108f0e0b09b2d4a77d902ac6 Reviewed-on: http://git-master/r/37435 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-21video: tegra: hdcp: correct retry delay conditionPritesh Raithatha
This incorrect condition adds sleep to i2c read & write functions even though they are executed successfully. Bug 831891 Change-Id: If029b16c724516e96bf75458c60ca6b411ab5a96 Reviewed-on: http://git-master/r/37463 Reviewed-on: http://git-master/r/37472 Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com> Tested-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-17tegra: dc: set HDMI clock to 0 if HDMI unpluggedtegra-10.11.10Xin Xie
HDMI clock is not auto dvfs, so we need set the clock rate to 0 if HDMI is disabled. Otherwise the Vdd core voltage will be always 1.2v even after HDMI cable unplugged. BUG 828306 Reviewed-on: http://git-master/r/34379 (cherry picked from commit 58ddd144a6c2dd9bbc9d2f3c8b1e025364d88c22) Change-Id: I5b455a7a945d4834fb162b2986639df5a26b112c Reviewed-on: http://git-master/r/37176 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com>
2011-06-14video: tegra: dc: make hdcp respond quickly on HDMI modeset.Seongho Joo
hdcp worker could be in sleep during modeset. The front part of the video could be lost because of it. This change makes hdcp respond quickly to shorten the delay. bug 826468 Reviewed-on: http://git-master/r/#change,35449 Change-Id: I4e0105b1bc5815b223810d23ca8595747e541ee6 Reviewed-on: http://git-master/r/36417 Tested-by: Seongho Joo <sjoo@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-14tegra: dc: fix dc hang during dc resetMin-wuk Lee
1. fix dc hang during dc reset 2. do dc reset after dc clk enabling in reset worker function 3. remove a few build warnings Bug 801463 Change-Id: Icc85b09ae5cf5ab97839ae8625224ea2b163adb4 Reviewed-on: http://git-master/r/33112 Reviewed-on: http://git-master/r/36235 Reviewed-by: Min-wuk Lee <mlee@nvidia.com> Tested-by: Min-wuk Lee <mlee@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Hyong Bin Kim <hyongbink@nvidia.com>
2011-05-27video: tegra: add support for tiled surfacesMichael I. Gold
Change-Id: I035a6cd254342fe11f074cb85439f378a7675943 Signed-off-by: Michael I. Gold <gold@nvidia.com> Reviewed-on: http://git-master/r/33038 Reviewed-by: Brian Anderson <branderson@nvidia.com>
2011-05-27video: tegra: add display inversion supportAri Hirvonen
Change-Id: I6ec62abdaf3a8ec2e59e2a533b36b280d69538e1 Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com> Reviewed-on: http://git-master/r/33037 Reviewed-by: Michael I Gold <gold@nvidia.com> Tested-by: Michael I Gold <gold@nvidia.com>
2011-05-25ARM: tegra: dc: fix mutex lock in reset workerMin-wuk Lee
unlock mutex if reset worker finds the display disabled. Bug 801463 Reviewed-on: http://git-master/r/29898 (cherry picked from commit 672459efb81140b496e3749f1b1b14dcf84af74d) Change-Id: I94254fca387cddcd58166757e46422167ed9262d Reviewed-on: http://git-master/r/32758 Reviewed-by: Min-wuk Lee <mlee@nvidia.com> Tested-by: Min-wuk Lee <mlee@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-05-23video: tegra: dc: removed buggy DC reset assert.Vandana Salve
Removes changes to DC reset flow introduced in commit e9f069bc2c9e0a9e3d7dfd30b66367667ab82dee. Fixes the issue of HDMI output after playing 1080p stream. bug 820455 bug 826061 Change-Id: I9c0802c4c39d4f899e948e8020a721699634d84c Reviewed-on: http://git-master/r/31959 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
2011-05-23ARM: tegra: dc: fix h_ref_to_sync calculationJon Mayo
use smaller h_ref_to_sync values. removed old debug printks Bug 806009 (cherry picked from commit 8292b4988e6aa75c71f14cbf96dad8b5e931e681) Change-Id: Iae3e84ddd8c02be1a83f9ac255fc1152dc867f0b Reviewed-on: http://git-master/r/30585 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
2011-05-19tegra: video: add interface for use of tiled surfacesBrian Anderson
Change-Id: I8ee718e0d56ff8dc2f2c2e1b5215d195f317f0e2 Reviewed-on: http://git-master/r/31084 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
2011-05-19tegra: dc: adding max pixclock check for hdmiDonghan Ryu
tegra_dc_hdmi_equal doesn't check pixclock. some devices doesn't support 14.85Mhz pixclock so 1080p@60 cannot be used. However, 1080p@30 is supported. Therefore, adding a max pixclock prevents 1080p@60 mode is falsely used for those devices Bug: 815409 Change-Id: Ia2d8dcf360afa51e160d0e997986fe1714254a6b Reviewed-on: http://git-master/r/31663 Reviewed-by: Donghan Ryu <dryu@nvidia.com> Tested-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-05-16nvrm: move stale wait checking into the kerneltegra-11.2.6Chris Johnson
The kernel now receives wait tracking data (similar to gathers and relocs) and compares the current syncpt with the threshold value. If it's old, it gets a kernel mapping and rewrites the method data to use a kernel reserved syncpt that is always 0 (so trivially pops when seen by the HW). Bug 519650 Bug 785525 Bug 803452 Note: reset the author in this commit to fix a email addr problem and since from the latest/last cherry pick there was a reworking of the code to be compatible with different user space versions it also seemed reasonable. (cherry picked from commit 4069d8e67665624ad3dceb628e572980dd57acd0) (cherry picked from commit 6e4336408588e348804a62e53386acc9abc06823) (cherry picked from commit 87a9efe751716ca741caac72b9061fdfdcec540a) Change-Id: I9c6076da2384f373d5f402bee4406b09b4ebc4ff Reviewed-on: http://git-master/r/23159 Reviewed-on: http://git-master/r/30281 Tested-by: Chris Johnson <cwj@nvidia.com> Reviewed-by: Ken Adams <kadams@nvidia.com> Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
2011-05-10ARM: tegra: dc: clip invalid windows to screen resJon Mayo
clip invalid windows to fix screen size, failure to do so causes display errors that result in corrupted display and invalid video modes. prints a warning only once, if this warning is present in the logs then there is a misbehaving application. Bug 821094 (cherry picked from commit e08f18eba00bd5d86cb7770f709417a1bd0ca14f) Change-Id: Ie5cec5c805bfe2bd4c5f1e5b7e22d5f255ca2680 Reviewed-on: http://git-master/r/30587 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-05-09video: tegra: dc: handle error conditionAmit Kamath
Do not handle requests further for displays that are not enabled Bug 813310 Bug 813728 Reviewed-on: http://git-master/r/29515 (cherry picked from commit 22578f1d7065ea84855fdbcaf09a792e9f9d3856) Change-Id: I1fa907e33f2d250fff64752c8f0e26de51f3655b Reviewed-on: http://git-master/r/30672 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-25merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mm/proc-v7.S drivers/video/tegra/dc/dc.c Change-Id: I40be0d615f14f1c01305388a706d257f624ba968
2011-04-21Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-04-21video: tegra: dc: Fix several problemsAndrei Warkentin
Resolve potential race between resume and reset Fix wmb after return Change-Id: I98ad1e713b9781d780bf93561496011bf62b86d1 Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
2011-04-20merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: I903db54b76781cdb9231bb25d79635cb8f264087
2011-04-19video: tegra: dc: hdcp: handle the case of DEVICE_COUNT = 0 properlyPeter Zu
bug 811316 Change-Id: I4513f81719a60c8f214ee07082e58defb1cca0aa Reviewed-on: http://git-master/r/26985 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-04-19video: tegra: dc: removed incorrect cropping codeDonghan Ryu
there was a cropping code which saves from out of FB.However, the cropping code was wrong and cropping should be done from usermode driver instead of kernel. a warning is added here for easy debugging Bug 792524 Change-Id: Id57243e36f903b14a093dad23a6111032890c01a Reviewed-on: http://git-master/r/28055 Reviewed-by: Donghan Ryu <dryu@nvidia.com> Tested-by: Donghan Ryu <dryu@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-19Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36Erik Gilling
Change-Id: I023482f230dc4f413647f47b3c7c36fd4c98b97d
2011-04-19video: tegra: prevent double disable in suspendAndrei Warkentin
Prevents HDMI detect worker from re-disabling DC during suspend (after tegra_dc_suspend has disabled DC itself)/ Change-Id: I90016fb709934ab8fb5135443980898069f8071f Signed-off-by: Andrei Warkentin <andreiw@motorola.com> Signed-off-by: Erik Gilling <konkers@android.com>
2011-04-19video: tegra: dc: hdcp: handle the case of DEVICE_COUNT = 0 properlyPeter Zu
When HDCP repeater has no device attached, DEVICE_COUNT reports back as 0. HDCP driver should handle this case as a good case and continue downstream authentication, other than fail it. Change-Id: Ied2e46428c0247f14fbd96016cd4fdbf358f6587
2011-04-18merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Change-Id: Ibf21f94d93ef237de6ab379dc1aa2498df08cdbd
2011-04-15tegra dc: fix premult dst alpha blendingFrancis Hart
Register assignments were wrong for incoming overlay blend parameters. DisplayManagerLite policy sets src combine mode to premult to signal dst premult aplha blending. But the DC expects premult set for the dst window for this mode. Bug 796009 Change-Id: I5929bc4cd362ac60c7a9f14bb4ae83da04b857ab Reviewed-on: http://git-master/r/26835 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-04-15Merge branch 'linux-tegra' into android-tegraErik Gilling
2011-04-15video: tegra: fix more unplug/suspend timeout in nvhdcpErik Gilling
Change-Id: I30dfa03324eb5c4c344c62578eb808a150c80deb Signed-off-by: Erik Gilling <konkers@android.com>
2011-04-14ARM: tegra: dc: hdmi drive strength changesJon Mayo
use pixel clock to configure HDMI interface signaling properties. These options are different depending on which SoC. Bug 786961 Bug 795251 (cherry picked from commit a59e2483a9f85a72186f51c124709401af554eb3) Change-Id: Ie5ef35fe03065d3e77831a0e1a2bbf8319d04125 Reviewed-on: http://git-master/r/27722 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Tested-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: Jessica Liao <jeliao@nvidia.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-13 11:26:15 +0000