Commit Graph

66 Commits

Author SHA1 Message Date
JohnnLee
ffec99e9b1 Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/include/asm/assembler.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/kvm_mmu.h
	arch/arm64/kernel/cpu_errata.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/entry.S
	arch/arm64/kvm/hyp/hyp-entry.S
	arch/arm64/mm/mmu.c
	drivers/net/usb/ax88179_178a.c
	drivers/soc/qcom/scm.c
	drivers/soc/qcom/socinfo.c
	drivers/usb/gadget/function/f_fs.c
	include/linux/arm-smccc.h

Bug: 261541074
Change-Id: I7f46738f04f5c301487dc92db5c5fa808d99bc79
Signed-off-by: JohnnLee <johnnlee@google.com>
2023-02-01 11:14:50 +08:00
JohnnLee
bb9406fd87 Merge branch 'LA.UM.9.12.C10.11.00.00.840.415' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/kona_defconfig
	drivers/char/adsprpc.c
	drivers/dma-buf/dma-buf.c
	drivers/firmware/qcom/tz_log.c
	drivers/hid/hid-holtek-mouse.c
	drivers/mmc/host/cqhci-crypto-qti.c
	drivers/soc/qcom/qmi_rmnet.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/rndis.c
	fs/f2fs/super.c
	net/sctp/input.c

Bug: 253163588
Change-Id: Ie21081a2d496960b56a3a2ac9cb6c45e285e698e
Signed-off-by: JohnnLee <johnnlee@google.com>
2022-12-20 15:31:17 +08:00
Waseem Akhtar
1eddffa235 msm: camera: Increase the total number of camera ID's supported
Increase the total number of camera ID's supported.

Change-Id: Ib1eb78eb1d6686b28c90b06b87fa57bcc1f45c07
Signed-off-by: Waseem Akhtar <quic_wakhtar@quicinc.com>
2022-09-13 12:25:42 +05:30
Gaurav Jindal
925291428b msm: camera: Add Page Read, DelayUSEC support in camera i2c
Add Page Read, writeDelayUSEC and Continuous Read support in
camera i2c operations.

Change-Id: I58e269477c8158dd1cc394925cb7a3d175546b0a
Signed-off-by: Gaurav Jindal <quic_gjindal@quicinc.com>
2022-06-30 11:13:39 +05:30
JohnnLee
31312764d1 Restore camera related files for AU201 integration
Bug: 213281691
Bug: 210578498
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: I7b3a2e9542f4ecb64cb08c0fffe72df6204f1383
2022-03-08 15:43:57 +08:00
JohnnLee
2ec8b3a5cb Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	Documentation/devicetree/bindings~qcom
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	drivers/char/diag/diagmem.c
	drivers/dma-buf/dma-buf.c
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/kgsl.c
	drivers/hid/Kconfig
	drivers/hid/hid-ids.h
	drivers/hid/hid-playstation.c
	drivers/hid/hid-quirks.c
	drivers/md/dm-default-key.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
	drivers/power/supply/qcom/Makefile
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c
	fs/f2fs/node.h
	fs/f2fs/recovery.c
	fs/f2fs/segment.c
	fs/incfs/data_mgmt.c
	fs/incfs/format.c
	fs/incfs/main.c
	fs/incfs/vfs.c
	include/linux/mm.h
	include/soc/qcom/memory_dump.h
	kernel/futex.c
	mm/mmap.c
	mm/mremap.c

Bug: 210578498
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: Ic925ed432e887337ebd6027007853cedde7fd64e
2022-03-08 15:42:12 +08:00
Ankush Agarwalla
158d0f19d3 include: uapi: Add support for 128x32 alignment of NV12
Introduce new uapi color format
COLOR_FMT_NV12_128 to map with NV12 128x32
alignment.

Change-Id: Ic9f4dea15108d05a49d9abdcab24459746111fe5
Signed-off-by: Ankush Agarwalla <agarwall@codeaurora.org>
2021-07-12 08:17:24 +05:30
JohnnLee
7f87d9d48b Revert "msm: media: uapi: Redefine NV12 format with different alignment"
This reverts commit 4e5d64083e.

Bug: 187468686
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: Iede6557312a1e9b2edec2266713e0c612df88171
2021-05-14 10:43:48 +08:00
Vikash Garodia
4e5d64083e msm: media: uapi: Redefine NV12 format with different alignment
Consider NV12 color format alignment differently for 32bit and
64 bit compilation.

Change-Id: Iffd2335f473b765085e9ffeb485b3015cccf1eab
Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org>
2020-09-21 02:42:31 -07:00
Vasantha Balla
94396172bb vidc_3x: Fix IDR control setting issue
Move V4L2_CID_MPEG_VIDC_VIDEO_IDR_PERIOD to
vidc_3x uapi media header file msm_vidc.h.

Change-Id: I70def7b864d5d01faf7f5953ede0031650bb224d
Signed-off-by: Vasantha Balla <vballa@codeaurora.org>
2020-07-29 10:21:03 -07:00
Gurram Pravalika
fd609b9598 msm: camera: Adding camera specific header files
1.Included header files in gen_headers_arm.bp
  To fix the compilation.

Change-Id: Ie70ce68ed84f52b6eb2d854bd7ec7086d314b35b
Signed-off-by: Gurram Pravalika <gpravali@codeaurora.org>
2020-07-24 10:44:25 -07:00
Gurram Pravalika
9496ff988e msm: camera: compilation fix in isp
Fixing compilation errros in ISP module.

Change-Id: I36cd20c8ef326f4cc3e5bf8ee3951503609b6cc0
Signed-off-by: Gurram Pravalika <gpravali@codeaurora.org>
2020-07-21 01:05:54 -07:00
Vasantha Balla
6e7d1f9d72 vidc_3x: Add snapshot of video driver
This is snapshot of the video driver as of msm-4.14(vidc_3x)
commit 9dc1a255ba77c95 (" Fix qbuf error in gralloc buffers encoding").

Change-Id: I146b66cb0e0ce44d8414efaa8748c2de87b9fc74
Signed-off-by: Vasantha Balla <vballa@codeaurora.org>
2020-07-12 09:24:45 -07:00
Qiwei Liu
268299cd8f msm: vidc: support 2-bit ROI map type
Add controls to query supported ROI map type,
2-bit or 2-byte.
Add payload structure for 2-bit ROI map.

Change-Id: I18c5a00d65e9ccebb821e8e87b777a1897f14921
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
2019-10-24 03:42:26 -07:00
George Shen
25f5cfd939 msm: cvp: cvp power management enhancement
Knowledge of break-down of CVP core sub-blocks cycle usage enables
driver to tune CVP clock and ddr vote in finer granularity. The change
is backward compatible with legacy power voting mechanism. The
enhancement only takes place when user mode provides extra knowledge
needed.

Change-Id: I596e2ad0e585723364e26db3547db41b1af45997
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-09-18 12:38:18 -07:00
Govindaraj Rajagopal
ac10277b00 msm: vidc: remove unused entries in msm_vidc_cb_event_types
[1] remove unused enums in msm_vidc_cb_event_types.
[2] add MSM_VIDC_FW_MIN_COUNT to support fw_min_count.

Change-Id: Ied36d983680cade60186cd2c3c5c930c5ecb69c7
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2019-09-06 05:02:46 -07:00
Govindaraj Rajagopal
a4599f1a33 msm: vidc: add plane_reserved_field and cb_event type enums
[1] Added msm_vidc_plane_reserved_field_types enum for
    setting/getting plane reserve fields.
[2] Added msm_vidc_cb_event_types enum for setting/getting
    Seq_changed_event types.

Change-Id: Ie6cb908515c9714d26f00fdd25af2dfcd875d725
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2019-08-22 15:09:23 +05:30
Mukund Madhusudan Atre
c6b1e669ae msm: camera: uapi: Remove Camera uapi headers
Move camera codebase from kernel project to camera kernel
component. This change removes camera realted uapi headers.

Change-Id: Id232c409c67ebdaa372bb374474ecf27d0518d77
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-08-11 00:36:33 -07:00
Ruofei Ma
6a9d93dd97 msm: cvp: cvp face detection fence feature support
Enable fence support for face detection feature.

Change-Id: I2f91d133ba5a2e04b335c0ab25dd9a71b8e1e34f
Signed-off-by: Ruofei Ma <ruofeim@codeaurora.org>
2019-08-08 14:58:14 -07:00
Mukund Madhusudan Atre
401d3da109 msm: camera: Add uapi definitions for camera reg dump
For debugging, there are a set of register values that user
space needs. Based on the offset and range given, values can
be dumped into an out buffer to be further processed. Add
uapi support for this reg dump.

Change-Id: I6e6f89625a505158a6bf8932ebb9d0ae78bf0129
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2019-08-04 19:19:44 -07:00
Jigarkumar Zala
ac743b4f83 msm: camera: Update uapi structure for OIS
Userspace is sending slave address as 32bit, and in order to parse
the correct data kernel space needs to match this bit pattern.
This change updates the structure to accommodate it.

Change-Id: Ib136bbd1656dba9da75d3b07c494caeebf03dfcb
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-07-30 14:06:18 -07:00
Tejas Prajapati
25eb8adb7b msm: camera: isp: Add support for QCFA CSID binning
Add support to configure CSID binning for QCFA.

Change-Id: I9e2673d89f521a4b4fddc41ad1217ffe229d8b01
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-07-26 13:12:41 +05:30
qctecmdr
69f399082f Merge "msm: camera: crm: Increase the device handles to 128" 2019-07-15 17:38:51 -07:00
Karthik Anantha Ram
21aa959fe7 msm: camera: icp: Add support for semi real time device types
Add support for IPE/BPS semi real time device types.

Change-Id: I1d9974eb796ce1723205072651d53ecb84023e88
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2019-07-10 15:01:31 -07:00
Depeng Shao
ea385cee15 msm: camera: csid: add csiphy4 and csiphy5 support
Add csiphy4 and csiphy5 support.

Change-Id: I8523523556671ed6ffd7f880af2d18043c30d4eb
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2019-06-28 16:08:58 +08:00
qctecmdr
e8cae6fe72 Merge "msm: cvp: Add support of new session control commands" 2019-06-21 02:30:25 -07:00
Govindaraj Rajagopal
0ad9912498 uapi: amend interlace buffer size calculation condition
Interlace video playback is failed for resolutions like 1600x1200
due to insufficient buffer size. Avoid the issue by correcting
interlace video buffer size calculation condition.

Change-Id: Ieaf9b62c75c0766f268eb1178be83bf17f0de7d5
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2019-06-19 13:49:38 +05:30
George Shen
05c9b8f7a3 msm: cvp: Add support of new session control commands
CVP session create command allows user mode to set session
attributes before start using the session. CVP session delete
command allows user to shutdown session before close device.

Change-Id: I13ebf82f86733624f46f7bb876befbc7fb8ecc0c
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-06-17 13:45:46 -07:00
Mangalaram ARCHANA
39f1b03f09 msm: camera: crm: Increase the device handles to 128
Increasing the device handles to 128 to support more
pipelines.

Change-Id: Id0322cba095091e6168d8541d432628d8422a641
Signed-off-by: Mangalaram ARCHANA <mangar@codeaurora.org>
2019-06-14 15:16:31 -07:00
Qiwei Liu
3cea88aa39 msm: vidc: correct buffer alignment description
Correct the buffer stride/scanline alignment description
to match with code.

Change-Id: Id3d53cd446fbfd64732256aa1729b286c3581872
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
2019-06-10 20:15:38 -07:00
George Shen
4bf9c554b8 msm: cvp: Enhance CVP debugability
For better CVP debugability, the change provides HFI version
to user, clean up unnecessary driver logging.

Change-Id: I8685dfa76c0e61db48212d9ea900c061f07484cb
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-05-21 09:56:58 -07:00
Ruofei Ma
16166276b9 msm: cvp: Enable async ICA
Enable ICA async path with synx for camera use case.

Change-Id: I47fd81d487617a2173b43d67464f6af92a98afad
Signed-off-by: Ruofei Ma <ruofeim@codeaurora.org>
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-05-13 17:45:41 -07:00
Mukund Madhusudan Atre
4c13fa3870 msm: camera: Add uapi changes for axi bw voting v2
Adding uapi definitions for providing granular bw vote info
for camnoc, mnoc ab/ib and ddr paths.

Change-Id: I08a5dd6859b05f869baf9d7a133e00892a89b425
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2019-05-09 15:18:56 -07:00
qctecmdr
fe7ca12935 Merge "msm: cvp: Update configuration for Pyramid feature" 2019-04-28 00:32:48 -07:00
qctecmdr
8ece3fcd08 Merge "msm: camera: sensor: Fix wait command opcode mismatch" 2019-04-28 00:32:45 -07:00
George Shen
2e73c5db55 msm: cvp: Update configuration for Pyramid feature
Support CVP Pyramid feature with reduced number of
Octaves and scales per octave.

Change-Id: Id6c450ed2a0612bb5268c57d274ac006b07c4751
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-04-23 22:33:58 -07:00
qctecmdr
cd22865b1e Merge "msm: camera: isp: Add support to update write master" 2019-04-16 07:38:39 -07:00
qctecmdr
9cda37b2d7 Merge "uapi: Fix linear color format alignment" 2019-04-16 00:28:31 -07:00
Venkat Chinta
cafac95d7d msm: camera: isp: Add support to update write master
This change adds support to enable the userspace to
update certain write master configurations on the fly.

Change-Id: I7bf4f46e5fa2f4d58b65d19d9d56947cc1bb7300
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-04-11 12:08:14 -07:00
Viswanadha Raju Thotakura
24d069998a msm: camera: Add support for IFE features
1. Add support to listen multiple virtual channels and data
   types from the input stream at CSID.
2. Update to user driver about the selected HW.
3. Add support for picking right HW when custom node is enabled.

Change-Id: I69f2b880892d3c23103ea5b5352303864932eb67
Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
2019-04-10 21:45:19 -07:00
Sureshnaidu Laveti
45affb9be4 msm: camera: sensor: Fix wait command opcode mismatch
Corrected conditional wait opcode offset to parse and
update delay for poll operation.

Change-Id: I26a647cb8e0e7c4374d39bf10bfaabf528c038bd
Signed-off-by: Sureshnaidu Laveti <lsuresh@codeaurora.org>
2019-04-10 08:15:18 -07:00
Amit Shekhar
ab3b8db5a4 uapi: Fix linear color format alignment
Fix linear color format alignment. Alignment follows:
Y_Stride: Width should be aligned to 512.
UV_Stride: Width should be aligned to 512.
Y_Scanlines: Height should be aligned to 512.
UV_Scanlines: Height/2 should be aligned to 256.

Change-Id: Id858b656746b574a2b2ef0db6de5478e73eeb136
Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
2019-04-05 17:18:53 -07:00
qctecmdr Service
a0ea5cbbc1 Merge "msm: camera: Add support for enabling DSx, stats and input select" 2019-03-25 11:46:23 -07:00
Viswanadha Raju Thotakura
517c38125c msm: camera: Add support for enabling DSx, stats and input select
DSx, stats and input select are part of core config registers.
Add support to enable them.

Change-Id: I8e7ea618a57c235d23c4fb65c9fce8087f153cbc
Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
2019-03-21 14:56:20 -07:00
George Shen
2ae010463e msm: cvp: optimize CVP HFI packet handling
Remove redundant handling logic. Rename CVP system call
command structure to avoid name conflict with video driver.
Add new commands needed by camera processing pipeline.

Change-Id: I59a628f7ae2bf9ad7c6e075ed3e1a3794f25e05c
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-03-18 11:33:02 -07:00
George Shen
fd5a2f0d06 msm: cvp: enable ICA of DME feature
Enable ICA (Independent Component Analysis) property of DME
(Descriptor-based Motion Estimate) feature.Increased size
of DME configuration packet to allow user space add ICA
properties into the HFI (Host Firmware Interface) packet.

Change-Id: I1ae87da8bf5589f238e2bfc17f3709f663fd3315
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-03-08 11:48:08 -08:00
qctecmdr Service
e99b33e437 Merge "msm: vidc: Enable decoder HDR histogram" 2019-03-06 05:47:25 -08:00
Mihir Ganu
e33a8608ed msm: vidc: Enable decoder HDR histogram
Enable decoder HDR histogram as default extradata. Histogram
of luma values is generated by firmware for each scene.
Histogram data is provided to clients as extradata and clients
can use this for dynamic tone mapping.

CRs-Fixed: 2384822
Change-Id: If3c09ff718aa0a9951a1c1be2ea45a627d743d3a
Signed-off-by: Mihir Ganu <mganu@codeaurora.org>
2019-02-25 21:06:16 -08:00
abhikran
5c026fcbfe msm: cvp: Enable DFS and DME features on CVP
Add support to enable DFS (depth from stereo) and DME
(descriptor motion estimate) features of CVP (computer
vision processor) on Kona.

Change-Id: Id8613c396bcfbecb8c39ddc3f0d64c2f6b85d57f
Signed-off-by: abhikran <abhikran@codeaurora.org>
Signed-off-by: George Shen <sqiao@codeaurora.org>
2019-02-22 17:56:41 -08:00
Venkat Chinta
c16dc6e8f4 msm: camera: ife: Enable UBWC 4.0
This change adds uapi and bus driver support to enable
UBWC 4.0 on version 480 hardware. The change also adds
a generic, expandable internal structure to handle all
api versions of ubwc blob updates.

Change-Id: I021c3bf5444575e03f5760ff5e7c3966045e443f
Signed-off-by: Jeyaprakash Soundrapandian <jsoundra@codeaurora.org>
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-02-13 11:40:51 -08:00