Commit graph

5006 commits

Author SHA1 Message Date
yetta_wu
c25e012c4e Display: slimport porting - update to V0.3
1. slimport basic function
2. set gpio 50 as 27M clock (function_2, refer to document 80-N7752-2 p.435)
3. request USB_ID pin (gpio 77) to let detect pin work
4. the version history:

V0.1
The gerenal slimport ANX7808 driver for customer evalutaion and application.

2013-01-08
V0.2
1. Add pull down ID_OUT pin once the slimport accessary is plugged, and left it to default status
   once the accessay is unplugged.
2. If the incoming video is YUV, convert it to RGB colorspace, since our RGB dangle only support RGB.

2013-01-29
V0.3
1. Correct the error in eye diagram test.
2. Correct the phy auto test.

Change-Id: I0d35945b5682ca736ec00b3d5166001f2ab5dfc3
Change-Id: Ibdf3ba27e119f0ae361b28b1f33f7522d5fdf758
Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/67937
Reviewed-by: Yetta Wu <Yetta_Wu@asus.com>
Tested-by: Yetta Wu <Yetta_Wu@asus.com>
Reviewed-by: Warlock Tai <warlock_tai@asus.com>
2013-04-18 16:07:52 -07:00
yetta_wu
3d143f532a Display: SR1 mipi panel porting
1. port LG and panasonic panel
2. remove the choice "LCD Panel" in Kconfig because we need to config multiple mipi panels in one code base
3. pwm and LCD_BL_EN power source change to L17

Change-Id: I793114db222ed7712662495cd7106f1d0d41ddd3
Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/67830
Reviewed-by: Warlock Tai <warlock_tai@asus.com>
Tested-by: Warlock Tai <warlock_tai@asus.com>
2013-04-18 16:07:51 -07:00
Deva Ramasubramanian
923748c24e msm: vidc: add support for the bitstream_restrict flag
Adds support for the MFC core to add the bitstream_restrict flag in the
sps/pps for H264 codecs.  This allows for the decoder to determine how
many frames to buffer when decoding.

Change-Id: I30dc17a29b9fcc1ee76265f0318a0a581316dd49
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	include/media/msm/vcd_property.h
2013-03-18 10:12:44 -07:00
Iliyan Malchev
24a803537e Revert "msm_fb: display: Copy splash image to kernel memory"
This reverts commit 4b105e60c4e889c4069bf725113a89f3a7d66ced.

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/video/msm/msm_fb.h
2013-03-15 17:29:25 -07:00
Iliyan Malchev
97b83c2355 Revert "Revert "mako: enable lgit lcd driver""
This reverts commit ba14d0b42c.

Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-03-15 17:13:31 -07:00
Iliyan Malchev
7b3f249b1a msm: display: clear suspend flag at end of mdp4_dsi_video_on
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-03-15 17:13:07 -07:00
Devin Kim
8db2dc270f mako: add lcd turn-off sequence on shutdown
In the normal case, when the device is turned off, lcd off function doesn't
work.  However, we still need to turn off the panel and DSV convertor. This
patch adds an LCD turn-off function and calls it on device shut down.

Change-Id: I5526f0f08567190050527121d7e0890c05607a68
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-03-15 17:09:28 -07:00
Huaibin Yang
f332bc0695 msm_fb: display: balance secure map and unmap in each mfd
Make sure secure map and unmap get called in each mfd and balanced.
Otherwise, secure contents can not be played for both primary and
hdmi.

CRs-fixed: 450427
Change-Id: I5399be64fbb104dc3cbe2c5c65b3f4406f47473c
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
2013-03-15 17:09:21 -07:00
Naseer Ahmed
8e4d11495c msm_fb: Update MDP fence wait behaviour
The current fence wait times out too early in cases where the GPU
is under a heavy workload. Change this behaviour to warn and wait
for a longer time for GPU to complete it's work.

Change-Id: I8b20c22733a77c1aaea4a1fd1e4daaa14b5ec2fd
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
2013-03-15 17:09:19 -07:00
Kuogee Hsieh
88191d9b1e msm_fb: display: fix fence fd list be put twice
msm_fb_wait_for_fence() will put fence fd list if sync_fence_wait()
failed. After that same fd list wil be put one more time. This
cause a fd put twice and cause system crash at the time fd
was closed.

Change-Id: If6a358e051c98841e34c23d81098243003ef0836
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:09:16 -07:00
Kuogee Hsieh
1ef7647717 msm_fb: display: add mutex to video_off
It is possible  that pipe_commit still be issued by
frame work after suspend had been started. Therefore
mutex lock within video_off is necessary to prevent
race condition from happening between these two threads.

Change-Id: I57f51744c1654d6def8664c492035631a5b7081e
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:09:14 -07:00
Ravishangar Kalyanam
f1c764d118 Revert "msm_fb: display: Register MDP fault handler with IOMMU driver."
This reverts commit 9f36ce34dc0e6f840c6198430adfb44142d91f4b.
This enables the IOMMU page fault register dumps from default
handler.

Change-Id: Icddd2394f5aa337e1a4998247cc4e3201f752e84
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
2013-03-15 17:09:01 -07:00
Kuogee Hsieh
848c8f8de6 msm_fb: display: calculate mdp clock including borderfill pipe
For hdmi case, mdp clock calculation needs including borderfill
pipe to prevent dtv underrun while system is in suspend.

Crs-fixed: 449027
Change-Id: I98789343317d5cfdf1f56e496cecb4dd663c907f
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:08:55 -07:00
Maheshwar Ajja
7ccb844344 vidc: Turbo mode for multiple instances
If macroblock count per second goes beyond 1080p 30fps,
then bump the clock to turbo on supported platforms.

CRs-fixed: 455464
Change-Id: I48c34c9b6987706ea3e6b412b57791e2ae07ba52
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2013-03-15 17:08:54 -07:00
Deepak Verma
ed1ab2ee7d msm: vidc: Fix klocwork error
This change fixes the klocwork errors

Change-Id: I73a6ed0e568e98a51c8e095b824a783f91ce6657
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
2013-03-15 17:08:49 -07:00
Deva Ramasubramanian
06e5e6ec87 msm: mdp: Move wfd state signalling into mdp driver
Previously the WFD driver was reponsible for signalling the
online/offline events to userspace listeners.  This led to redundant
notifications due to the manner in which the WFD driver is used. The
signalling is better purposed when done from MDP driver.

Change-Id: Ifffbacb565f8758b65139f7b0e32df0773247e2d
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2013-03-15 17:08:48 -07:00
Mayank Chopra
8eb221e7d3 msm_fb: display: Program source address registers correctly
Scale filter FIR uses the adjacent pixels as part of the
processing. Source address registers should be program such that
they point to the first valid pixel so that non-ROI pixels are
ignored. This is done by making source x,y offsets to zero and
adding the computed offset to source address.

CRs-Fixed: 380020
Change-Id: I998fdd46f39dc67f32c422ec209da59d1add2e95
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>

Conflicts:

	drivers/video/msm/mdp4_overlay.c

Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
2013-03-15 17:08:46 -07:00
Kuogee Hsieh
c4917bf54e msm_fb: display: check active queue before signal timeline
This patch make sure active queue is not empty before signal
timeline.

Crs-fixed: 453745
Change-Id: I450c0923a67bdc90d06249e3ba83edb0b3b4b319
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:08:42 -07:00
Kuogee Hsieh
dfd02b2265 msm_fb: display: provision of mixer reset function
Mdp has hardware bug which cause fetch engine stalled if less than
3 pixels at begin or end of line be cropped into destination. Reset
mixer can fix this problem. However frame work can provide better
work around solution by falling back to gpu if the condition detected.
This patch will not reset mixer but provide mixer reset function in
case of mixer reset is need in future.

CRs-fixed: 443018
Change-Id: I38ee591f28bf1b81f4fbd58838281b43ba0a8498
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:08:40 -07:00
Maheshwar Ajja
2347c7222f msm: vidc: Reduce priority of unwanted logs
Change reduces the priority of unwanted logs
which are coming in kernel logs by default
in video driver. Now these logs will come
only when enabled.

Change-Id: I18a534c7aaf8a2819be1b8812fad9e0710c49bd3
CRs-fixed: 454273
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2013-03-15 17:08:39 -07:00
Carl Vanderlip
8ed6b6247d video: msm: Add revision check to calibration API
Add ability to check MDP revision to the calibration config API. Allows
calibration tool to check specific MDP revision for proper tuning.

Change-Id: I926ed21704507cb390c283e5c4383dcf7fbf8030
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
2013-03-15 17:08:38 -07:00
Siddhartha Agrawal
fd50a7a472 msm_fb: display: Configure solidfill color to black
The solidfill color was getting reset to to default state to white.
Correctly reseting to black by default.

Crs-Fixed: 453600
Change-Id: I203ce61867d009509bf6acd01169f1fb0b223652
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
2013-03-15 17:08:38 -07:00
Ken Zhang
8a2eb95560 msm: display: reset vsync state when display is turned on
In the case that vsync ctrl is unbalanced, vsync IRQ is cleared
in suspend,  vsync cannot be enabled after resume.
Clear the status when display is turned on

CRs-fixed: 449155
Change-Id: I5ecf23053b60d1fbd91f042758d67d39c83ab444
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
2013-03-15 17:08:29 -07:00
Ken Zhang
cd39a1efba msm: display: dsi command mode vsync time generation
In each vsync cycle there will be two vsync interrupts
generated, need ignore the wrong one to provide the correct vsync
timestamp.

CRs-fixed: 452269
Change-Id: Ic13eea77d15eb46f4879f818d346425c63efe41a
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
2013-03-15 17:08:27 -07:00
Nagamalleswararao Ganji
00c0980018 msm_fb: Optimize the resolution change on hdmi interface
HDMI resolution is changed twice on cable connect.
This will optimize resolution change by turning on
HDMI core only once, with best possible resolution.

Change-Id: I7f636b0c2c64eb3c661fda2a709b5480db05bd27
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
Signed-off-by: Abhishek Kharbanda <akharban@codeaurora.org>
2013-03-15 17:08:24 -07:00
Kuogee Hsieh
128c3afaf1 msm_fb: display: add early_off during panel off
Some panels need to send display_off command before
dsi controller turned off. This patch add early_off
feature for this purpose.

Change-Id: Id377120e9d6972c5f773760369ec056be37e93ff
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:08:24 -07:00
Siddhartha Agrawal
90f633305e msm_fb: display: Send pixel data while sending on/off commands
To avoid LCD off sequence violeation for some LCD vendors,
we need to keep sending video data during off/sleep commands.
This fixes issues seen while going to a suspend.

Crs-Fixed: 445707
Change-Id: I0ba2704502e8959d0f82deea60481cd5b1f0be20
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
2013-03-15 17:08:23 -07:00
Kuogee Hsieh
24683eeb25 msm_fb: display: wait4vsync before set suspend flag
Since wait4vsync checks suspend flag, wait4vsync needs to
be executed before suspend flag set to enforce wait happen.
Also, when timing generator is turned off, wait4vsync can
not be used anymore since the last vsync may have passed
before wait4vsync called. This patch fixed commit_comp
timeout cause fence timeout happen on hdmi plug and unplug
cases.

CRs-fixed: 449027
Change-Id: I0f5520538bb290643a648c937296b6bc097fe051
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:08:20 -07:00
Maheshwar Ajja
f7f116bf52 msm: vidc: Fix iommu pagefault in concurrent scenario
IOMMU pagefault is seen while running decoder and
encoder concurrently for specific codec combination.
Map double the buffer size to ion_map_iommu() API for
encoder reconstruction buffers to avoid the pagefault.

Change-Id: Ib5546a42a75c4c628767310f1a291e7ed443056c
CRs-fixed: 450621
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2013-03-15 17:08:20 -07:00
Ajay Singh Parmar
a2ccaef971 msm_fb: hdmi: HDMI resume delay
Remove the delay in HDMI resume sequence by not waiting for HPD
to be switched on. HDMI panel will not be turned on by default
when the device resumes and would instead be turned on by HPD
sense if it is still connected.

CRs-Fixed: 440559
Change-Id: Id276dddbcebf9226e9688aa1b5dad4b281545b21
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2013-03-15 17:08:13 -07:00
Vishnuvardhan Prodduturi
c485e86f15 msm_fb : display : Change fps level dynamically.
This change lets the user modify the fps level dynamically using
sysfs interface.

Change-Id: Ie99bbca5ec1a0b5ff5fa3570874b254e3fb7235c
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
2013-03-15 17:08:12 -07:00
Deepak Verma
e4f680fc0e msm: vidc: Add support for NV21 color format encoding
This change adds NV21 color format encoding support.

CRs-fixed: 448511
Change-Id: If26f1241a006e2d325668b8e189f6ff76df8e125
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
2013-03-15 17:07:57 -07:00
Carl Vanderlip
b9bfd3374a video: msm: Calibration config implementation
Allow software to selectively read/write MDP color calibration registers.
This is needed to allow calibration tool to individually configure
registers.

Change-Id: I5db2dcbca0b3433c7fedf9033ceff0cf6a5e0e1f
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
(cherry picked from commit afc6fbf054d079761d5c2ee85242e56d640ee409)
Signed-off-by: Pravin Tamkhane <pravint@codeaurora.org>
2013-03-15 17:07:54 -07:00
Shobhit Pandey
545808abfe msm: vidc: Move metadata shared input mem to firmware heap.
Metadata shared input is used to communicate between the
video core and video driver. Allocate it from firmware
heap for specific targets as MFC command heap size is
limited.

CRs-Fixed: 450118
Change-Id: I3d04cf6dd498ae67adcec7a8cba513bd7932d158
Signed-off-by: Shobhit Pandey <cshopan@codeaurora.org>
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
2013-03-15 17:07:49 -07:00
Kuogee Hsieh
3d92f40f27 msm_fb: display: remove extra mdp4_dsi_cmd_clk_check()
Since mdp4_dsi_cmd_clk_check() is called inside of
mdp4_dsi_cmd_pipe_commit() also, mdp4_dsi_cmd_clk_check()
is called two times from pan display route. This patch
remove mdp4_dsi_cmd_clk_check() from mdp4_dsi_cmd_overlay()
to avoid mdp4_dsi_cmd_clk_check() called twice from
pan display route.

CRs-fixed: 449809
Change-Id: Idbeb968e6af73abac2bb8c800a8c55015ea6a0bf
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:07:43 -07:00
Praveen Chavan
9af8e0b88c msm: vidc: unsecure heaps in the right order during error handling
Unsecure MM and CP heaps in the right order in case of failure
CRs-Fixed: 445400

Change-Id: I2b5d414c5d9f109740a931b75b0cfbdb196c465f
Signed-off-by: Praveen Chavan <pchava@codeaurora.org>
2013-03-15 17:07:40 -07:00
Duy Truong
04e554807c Update copyright to The Linux Foundation
Change-Id: Ibead64ce2e901dede2ddd1b86088b88f2350ce92
Signed-off-by: Duy Truong <dtruong@codeaurora.org>
2013-03-15 17:07:39 -07:00
Deva Ramasubramanian
e5cfb6035c Revert "msm: mdp: Move wfd state signalling into mdp driver"
This reverts commit b7d35468be026b0266bcb5217b72c6fbbf8b1bc0.

Change-Id: Iba80431f304dff64ba0427870dd857fc8729be28
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2013-03-15 17:07:35 -07:00
Ken Zhang
5fe00a30c9 msm: display: reduce timeline to 1 for smart panel
For smart display, dsi command and wfd, since it has its
own buffer, the input buffer can be released once the
display commit finishes, hence the fence threshold for
creation can be smaller. This patch reduce the timeline
from 2 to 1 for samrt panels. Also, it needs to
wait4dmap/wait4ov after kicked off. Otherwise, tearing may
happen.

Change-Id: I9eca871d8d863ef23b1d67b6e1e9cffea40ae4a6
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:07:35 -07:00
Kalyan Thota
53154a7b1f msm_fb: writeback panel commit should not happen when buffer is NULL
The change handles the NULL buffer case for writeback panel.
It avoids the H/W commit when buffer is NULL and also adds it to
free queue.

CRs-Fixed: 448340
Change-Id: I60f5d343d6de0f96353b081aa113f347c73c61af
Signed-off-by: Kalyan Thota <kalyant@codeaurora.org>
2013-03-15 17:07:33 -07:00
Kuogee Hsieh
d295b07b2e msm_fb: display: clean pipes from commit queue at suspend
There has possibility that pipes pending at queue and suspend
comes without commit executed. At resume, pipes pending at queue
will be committed with new pipes just added which may cause iommu
page fault due to pipes may had been move to other mixer. This
patch remove pipes from pending queue at suspend.

CRs-fixed: 440254
Change-Id: If6a142d4c55453c0ceacc677399f58570abe47b8
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2013-03-15 17:07:32 -07:00
Ajay Singh Parmar
9f0891b319 msm_fb: hdmi: Support for 1280x1024@60Hz resolution
This change provides the support for VESA resolution for
monitors, 1280x1024@60Hz with pixel clock of 108MHz.

CRs-Fixed: 438028
Change-Id: I059cd379d4da62f4e5b72be1152dd2fe26d611f1
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2013-03-15 17:07:32 -07:00
Ajay Singh Parmar
a71d78809e msm_fb: hdmi: hdmi 3d length check
This change fixes a case where the length of 3d data is not
properly used which could have resulted in wrong 3d data parsing.

CRs-Fixed: 445505
Change-Id: Id285204bdb8c2d881becaa5b07b973eba4240d93
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2013-03-15 17:07:31 -07:00
Ajay Singh Parmar
4e751bf012 msm_fb: hdmi: Do not turn on HDMI if not ready
At bootup, if HPD is not configured, HDMI is not in
the state of getting turned on. This change makes sure
HDMI is not turned on/off unnecessarily which turns on
clocks as well.

CRs-Fixed: 447511
Change-Id: I074d9c463943770775b060c4a93b9120dfe9bcf0
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2013-03-15 17:07:30 -07:00
Ajay Singh Parmar
e9f3e0c072 msm_fb: hdmi: update data on resolution change
On changing resolution, all information related to display
needs to be updated which helps in calculating the right mdp
clock for each resolution.

CRs-Fixed: 436151
Change-Id: I1ab6e5859491936a7fa8c62247da9ef5a0ff45ef
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2013-03-15 17:07:30 -07:00
Pradeep Jilagam
eb93a60c33 msm_fb: display: Copy splash image to kernel memory
The bootloader memory from which the splashscreen is shown
gets reclaimed before frame update happens from framework.
Hence, copy the splash image to a local buffer as soon as
display is initialized. This will ensure proper continuous
splashscreen functionality.

CRs-Fixed: 378721
Change-Id: I55a7b97eeced56d2f108d34998d58966610c4305
Signed-off-by: Pradeep Jilagam <pjilagam@codeaurora.org>

Conflicts:

	drivers/video/msm/msm_fb.h

Signed-off-by: Mayank Goyal <goyalm@codeaurora.org>
2013-03-15 17:07:29 -07:00
Deva Ramasubramanian
e484b03838 msm: mdp: Move wfd state signalling into mdp driver
Previously the WFD driver was reponsible for signalling the
online/offline events to userspace listeners.  This led to redundant
notifications due to the manner in which the WFD driver is used. The
signalling is better purposed when done from MDP driver.

Change-Id: I2248de84d57504c2fa9f26e1bfdf0e0d4a02257a
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2013-03-15 17:07:22 -07:00
Deepak Verma
05f4523804 msm: vidc: Add a check for separate metadata buffers
Added a check for separate metadata buffers based on
the board specific platform data.

Change-Id: I24d51329d93215da75d115ccfa8fc1f3fe260b7f
Signed-off-by: Deepak Verma <dverma@codeaurora.org>

Conflicts:

	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c

Signed-off-by: Deepak Verma <dverma@codeaurora.org>
2013-03-15 17:07:16 -07:00
Maheshwar Ajja
e576eb26d8 Vidc: Treat Non-IDR frame type error as bit stream error
Hardware error is being generated from driver when video
core returns NON IDR frame type error during thumbnail
decoding. This change handles this error by treating
it as BIT_STREAM_ERR.

Change-Id: I16a19eea679d42a22b336d6ebbd0bd1f57c0a8a4
CRs-fixed: 414858
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2013-03-15 17:07:08 -07:00
Maheshwar Ajja
3ae57f76cd msm: vidc: Correct the display size of small resolution clips
We change the frame height in the decoder to MDP_MIN_TILE_HEIGHT
for the videos with frame height less than 96. Due to which these
videos were not being displayed properly. This change fixes the
display change.

Change-Id: I7acc74742a8cfbdfc79b02bd20bb9109f4389fa2
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2013-03-15 17:07:08 -07:00