OSDN Git Service
Linux Build Service Account [Thu, 22 Jun 2017 21:00:17 +0000 (14:00 -0700)]
Merge "soc: qcom: glink: Move tx_wakeup_worker to rx tasklet"
Linux Build Service Account [Thu, 22 Jun 2017 21:00:15 +0000 (14:00 -0700)]
Merge "diag: Update msg mask tables for new SSID"
Linux Build Service Account [Thu, 22 Jun 2017 21:00:12 +0000 (14:00 -0700)]
Merge "drm/msm: Move memptrs to msm_gpu and reorganize"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:35 +0000 (07:40 -0700)]
Merge "icnss: fix the memory and kernel info leak due to the race condition"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:34 +0000 (07:40 -0700)]
Merge "msm: kgsl: convert some workqueues to use kthreads."
Linux Build Service Account [Thu, 22 Jun 2017 14:40:33 +0000 (07:40 -0700)]
Merge "power: smb-lib: Rearrange BOOST_BACK voting logic"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:32 +0000 (07:40 -0700)]
Merge "msm: vidc: Recompute extradata address of buffers with ref 2"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:31 +0000 (07:40 -0700)]
Merge "msm: vidc: Renaming the AU-Delimiter params/extens"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:30 +0000 (07:40 -0700)]
Merge "msm: camera: validate num_streams in stream_cfg_cmd before using it"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:29 +0000 (07:40 -0700)]
Merge "ARM: dts: msm: Update sensor device node for SDM660 QRD"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:28 +0000 (07:40 -0700)]
Merge "ath10k: Increase peer delete response wait to 500msec"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:27 +0000 (07:40 -0700)]
Merge "msm:camera: correct stats query out of boundary"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:26 +0000 (07:40 -0700)]
Merge "clk: qcom: osm: Initialize ACD when the cluster is online"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:25 +0000 (07:40 -0700)]
Merge "ais: refine some code style issues"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:24 +0000 (07:40 -0700)]
Merge "ARM: dts: msm: override initial pwrlevel for MSM8996ProAU"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:23 +0000 (07:40 -0700)]
Merge "Merge branch 'android-4.4@
6fc0573' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:22 +0000 (07:40 -0700)]
Merge "wil6210: protect against invalid length of tx management frame"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:20 +0000 (07:40 -0700)]
Merge "msm: camera: Add error check for cmd in IOCTL."
Linux Build Service Account [Thu, 22 Jun 2017 14:40:19 +0000 (07:40 -0700)]
Merge "drivers: soc: qcom: rpm_stats: Add mutex lock for shared data"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:18 +0000 (07:40 -0700)]
Merge "msm: camera: fix untrusted pointer for power down setting"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:17 +0000 (07:40 -0700)]
Merge "msm: ipa3: fix compatibility with ipa_nat driver"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:17 +0000 (07:40 -0700)]
Merge "msm: sps: Fix race condition in SPS debugfs APIs"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:16 +0000 (07:40 -0700)]
Merge "msm: camera: fix untrusted pointer for power down setting"
Linux Build Service Account [Thu, 22 Jun 2017 14:40:15 +0000 (07:40 -0700)]
Merge "msm: camera: Use mutex lock to avoid race condition"
Sarada Prasanna Garnayak [Thu, 8 Jun 2017 10:04:13 +0000 (15:34 +0530)]
icnss: fix the memory and kernel info leak due to the race condition
The icnss register read/write debugfs entry can be accessed by
multiple user space thread. Memory allocation and deallocation
in the register read/write file operation leads to potential memory
leak during concurrency access of debugfs device file.
Add protection to avoid the memory leak and kernel information
leak due to the race condition in the register read/write ops.
CRs-Fixed:
2012572
Change-Id: I22c6af9a396c0df4e68f75702fc68a5dff5af032
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Tim Murray [Mon, 20 Feb 2017 10:29:32 +0000 (15:59 +0530)]
msm: kgsl: convert some workqueues to use kthreads.
adreno_dispatch_work and _kgsl_event_worker are both low-latency
low-runtime functions that are in the critical path of GPU
rendering. Moving them out of workqueues and into a dedicated FIFO
kthread avoids significant jitter.
bug
30342017
Git-commit:
1a7a93bd33f48a369de29f6f2b56251127bf6ab4
Git-repo: https://android.googlesource.com/kernel/msm
Change-Id: I83562f488c34c2ab001c8ea79e7f09b633c658bd
Signed-off-by: Tim Murray <timmurray@google.com>
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
Chris Lew [Thu, 11 May 2017 23:54:10 +0000 (16:54 -0700)]
soc: qcom: glink: Move tx_wakeup_worker to rx tasklet
Do tx wakeup worker functionality in rx worker tasklet instead
of scheduling the work to be done in worker context to improve
performance.
CRs-Fixed:
2050701
Change-Id: Iba620e7e264805ed02a35603da1fb6c985de7d43
Signed-off-by: Chris Lew <clew@codeaurora.org>
Anirudh Ghayal [Fri, 26 May 2017 04:11:25 +0000 (09:41 +0530)]
power: smb-lib: Rearrange BOOST_BACK voting logic
The BOOST_BACK USB-ICL voter needs to be removed in the
following conditions -
1. VBUS falling path during PD hard-reset
2. typeC removal
3. False boost-back detected
For (1) and (2) - remove the boost_back vote in the usbin_handler
and typec_removal path. For (3) add a worker which removes the
boost_back vote after the boost-back condition is detected. The
delay is sufficient to recover from both a valid and an incorrectly
detected boost-back condition.
CRs-Fixed:
2051908
Change-Id: I9d1d04f392bb6040b0565510ff7d1032bb036de2
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Terence Ho [Wed, 14 Jun 2017 20:05:57 +0000 (16:05 -0400)]
msm: camera: validate num_streams in stream_cfg_cmd before using it
stream_cfg_cmd->num_streams is from userspace,
need to check it against MSM_ISP_STATS_MAX before using it.
CRs-Fixed:
2029867
Change-Id: I02a71b983947981806470454654d712bcc732077
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
Rakesh Pillai [Tue, 20 Jun 2017 07:31:21 +0000 (13:01 +0530)]
ath10k: Increase peer delete response wait to 500msec
Peer creation in firmware fails if last peer deletion is still
in progress. Need to wait for peer delete response from firmware
after deleting peer from host driver.
Increase the peer delete response wait time to 500msec.
CRs-Fixed:
2063832
Change-Id: I1c1c2500ae7f8ff1448f6b726d30dbbe3334957c
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Depeng Shao [Thu, 8 Jun 2017 08:50:33 +0000 (16:50 +0800)]
ARM: dts: msm: Update sensor device node for SDM660 QRD
Update main and aux camera sensor dvdd configuration
to enable the vreg and ldo together.
Change-Id: Iacc79799d1c06a3385a8cfd9ef80d707f8fa8d69
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
Fei Zhang [Tue, 20 Jun 2017 06:37:50 +0000 (14:37 +0800)]
msm:camera: correct stats query out of boundary
Fix a potential out of boundary query of stats info.
CRs-Fixed:
2041066
Change-Id: I76d4aa8c8ddd523fde007bfb6fa387a17930c2ba
Signed-off-by: Fei Zhang <feizhang@codeaurora.org>
Andy Sun [Wed, 14 Jun 2017 08:19:58 +0000 (16:19 +0800)]
ais: refine some code style issues
1. function/variable static declare;
2. dereference of noderef expression;
3. cast removes address space of expression;
4. using plain integer as NULL pointer;
Change-Id: If11a29aca93380de68a323880d55597bf320470f
Signed-off-by: Andy Sun <bins@codeaurora.org>
Terence Ho [Wed, 14 Jun 2017 19:49:25 +0000 (15:49 -0400)]
msm: camera: Add error check for cmd in IOCTL.
Return EINVAL if cmd is not v4l2 PRIVATE_IOCTL_CMD.
CRs-Fixed:
2016416
Change-Id: I6758bc9d6b159b2e2e4eba5a9d9a3882de320041
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
Hamad Kadmany [Tue, 20 Jun 2017 10:55:07 +0000 (13:55 +0300)]
wil6210: protect against invalid length of tx management frame
Validate buffer length has the minimum needed size
when sending management frame to protect against
possible buffer overrun.
Change-Id: Ib5aed79694100597d7f71a9e8d4e8dba91be538a
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Kasin Li [Thu, 15 Jun 2017 08:50:01 +0000 (16:50 +0800)]
ARM: dts: msm: override initial pwrlevel for MSM8996ProAU
Current DRM driver set GPU clock rate with initial pwrlevel and use it
all the time. This value is too low and couldn't cover many computing
tasks. Change to a higher value for automotive system.
Change-Id: I348f187bfb8c0c2a3936a132bc0142fd5553226c
Signed-off-by: Kasin Li <donglil@codeaurora.org>
Linux Build Service Account [Tue, 20 Jun 2017 10:20:41 +0000 (03:20 -0700)]
Merge "soc: qcom: rpm-smd-debug: initialize variables and check for return value"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:40 +0000 (03:20 -0700)]
Merge "msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctl"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:39 +0000 (03:20 -0700)]
Merge "qpnp-fg-gen3: Move getting battery id and profile to profile_load_work"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:31 +0000 (03:20 -0700)]
Merge "drm/msm: use 13-bit mask for h_total and v_total"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:30 +0000 (03:20 -0700)]
Merge "drm/msm: start secure domain va from non-zero address"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:28 +0000 (03:20 -0700)]
Merge "drm/msm: Remove superfluous hang check message"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:27 +0000 (03:20 -0700)]
Merge "drm/msm: Add a submit queue flag to disable the QoS timer"
Linux Build Service Account [Tue, 20 Jun 2017 10:20:27 +0000 (03:20 -0700)]
Merge "drm/msm: Add submit queue queries"
Siva Kumar Akkireddi [Thu, 11 May 2017 09:59:47 +0000 (15:29 +0530)]
msm: sps: Fix race condition in SPS debugfs APIs
SPS debugfs APIs can be called concurrently which can result
in dangling pointer access. This change synchronizes access
to the SPS debugfs buffer.
Change-Id: I409b3f0618f760cb67eba47b43c81d166cdae4aa
Signed-off-by: Siva Kumar Akkireddi <sivaa@codeaurora.org>
Amir Levy [Sun, 18 Jun 2017 07:10:37 +0000 (10:10 +0300)]
msm: ipa3: fix compatibility with ipa_nat driver
Add several defines and structs to allow IPA nat driver compile.
Change IPA_HW_MAX to be a define instead of enum so user space
can check its existence with ifdef.
Change-Id: I33df449d18b678dca44475f04eb72318179dda11
Signed-off-by: Amir Levy <alevy@codeaurora.org>
Taniya Das [Tue, 20 Jun 2017 04:56:46 +0000 (10:26 +0530)]
clk: qcom: osm: Initialize ACD when the cluster is online
The OSM clock driver currently enables ACD for the silver and
gold clusters regardless of whether they've been brought up or
not. ACD requires the cluster PLLs to be running for initialization,
a requirement which would not be met if the cluster hasn't been
brought online.
Tie the ACD initialization sequence with enabling OSM for that
cluster.
Change-Id: I4a7e7176e30b26d096645dd9ce508b7af8ae6df2
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Ray Zhang [Tue, 13 Jun 2017 05:10:50 +0000 (13:10 +0800)]
drm/msm: use 13-bit mask for h_total and v_total
HDMI TX controller can output 13-bit h_total and v_total
compare to 12-bit width of previous generation chipsets.
So use 13-bit mask for these HSYNC and VSYNC settings.
CRs-Fixed:
2052655
Change-Id: I2421a4e0a7646d10ba9e8f427807daa6a1bc1a21
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
Blagovest Kolenichev [Mon, 12 Jun 2017 14:30:14 +0000 (07:30 -0700)]
Merge branch 'android-4.4@
6fc0573' into branch 'msm-4.4'
* refs/heads/tmp-
6fc0573:
Linux 4.4.71
xfs: only return -errno or success from attr ->put_listent
xfs: in _attrlist_by_handle, copy the cursor back to userspace
xfs: fix unaligned access in xfs_btree_visit_blocks
xfs: bad assertion for delalloc an extent that start at i_size
xfs: fix indlen accounting error on partial delalloc conversion
xfs: wait on new inodes during quotaoff dquot release
xfs: update ag iterator to support wait on new inodes
xfs: support ability to wait on new inodes
xfs: fix up quotacheck buffer list error handling
xfs: prevent multi-fsb dir readahead from reading random blocks
xfs: handle array index overrun in xfs_dir2_leaf_readbuf()
xfs: fix over-copying of getbmap parameters from userspace
xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff()
xfs: Fix missed holes in SEEK_HOLE implementation
mlock: fix mlock count can not decrease in race condition
mm/migrate: fix refcount handling when !hugepage_migration_supported()
drm/gma500/psb: Actually use VBT mode when it is found
slub/memcg: cure the brainless abuse of sysfs attributes
ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430
pcmcia: remove left-over %Z format
drm/radeon: Unbreak HPD handling for r600+
drm/radeon/ci: disable mclk switching for high refresh rates (v2)
scsi: mpt3sas: Force request partial completion alignment
HID: wacom: Have wacom_tpc_irq guard against possible NULL dereference
mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read
i2c: i2c-tiny-usb: fix buffer not being DMA capable
vlan: Fix tcp checksum offloads in Q-in-Q vlans
net: phy: marvell: Limit errata to 88m1101
netem: fix skb_orphan_partial()
ipv4: add reference counting to metrics
sctp: fix ICMP processing if skb is non-linear
tcp: avoid fastopen API to be used on AF_UNSPEC
virtio-net: enable TSO/checksum offloads for Q-in-Q vlans
be2net: Fix offload features for Q-in-Q packets
ipv6: fix out of bound writes in __ip6_append_data()
bridge: start hello_timer when enabling KERNEL_STP in br_stp_start
qmi_wwan: add another Lenovo EM74xx device ID
bridge: netlink: check vlan_default_pvid range
ipv6: Check ip6_find_1stfragopt() return value properly.
ipv6: Prevent overrun when parsing v6 header options
net: Improve handling of failures on link and route dumps
tcp: eliminate negative reordering in tcp_clean_rtx_queue
sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
sctp: fix src address selection if using secondary addresses for ipv6
tcp: avoid fragmenting peculiar skbs in SACK
s390/qeth: avoid null pointer dereference on OSN
s390/qeth: unbreak OSM and OSN support
s390/qeth: handle sysfs error during initialization
ipv6/dccp: do not inherit ipv6_mc_list from parent
dccp/tcp: do not inherit mc_list from parent
sparc: Fix -Wstringop-overflow warning
android: base-cfg: disable CONFIG_NFS_FS and CONFIG_NFSD
schedstats/eas: guard properly to avoid breaking non-smp schedstats users
BACKPORT: f2fs: sanity check size of nat and sit cache
FROMLIST: f2fs: sanity check checkpoint segno and blkoff
sched/tune: don't use schedtune before it is ready
sched/fair: use SCHED_CAPACITY_SCALE for energy normalization
sched/{fair,tune}: use reciprocal_value to compute boost margin
sched/tune: Initialize raw_spin_lock in boosted_groups
sched/tune: report when SchedTune has not been initialized
sched/tune: fix sched_energy_diff tracepoint
sched/tune: increase group count to 5
cpufreq/schedutil: use boosted_cpu_util for PELT to match WALT
sched/fair: Fix sched_group_energy() to support per-cpu capacity states
sched/fair: discount task contribution to find CPU with lowest utilization
sched/fair: ensure utilization signals are synchronized before use
sched/fair: remove task util from own cpu when placing waking task
trace:sched: Make util_avg in load_avg trace reflect PELT/WALT as used
sched/fair: Add eas (& cas) specific rq, sd and task stats
sched/core: Fix PELT jump to max OPP upon util increase
sched: EAS & 'single cpu per cluster'/cpu hotplug interoperability
UPSTREAM: sched/core: Fix group_entity's share update
UPSTREAM: sched/fair: Fix calc_cfs_shares() fixed point arithmetics width confusion
UPSTREAM: sched/fair: Fix incorrect task group ->load_avg
UPSTREAM: sched/fair: Fix effective_load() to consistently use smoothed load
UPSTREAM: sched/fair: Propagate asynchrous detach
UPSTREAM: sched/fair: Propagate load during synchronous attach/detach
UPSTREAM: sched/fair: Fix hierarchical order in rq->leaf_cfs_rq_list
BACKPORT: sched/fair: Factorize PELT update
UPSTREAM: sched/fair: Factorize attach/detach entity
UPSTREAM: sched/fair: Improve PELT stuff some more
UPSTREAM: sched/fair: Apply more PELT fixes
UPSTREAM: sched/fair: Fix post_init_entity_util_avg() serialization
BACKPORT: sched/fair: Initiate a new task's util avg to a bounded value
sched/fair: Simplify idle_idx handling in select_idle_sibling()
sched/fair: refactor find_best_target() for simplicity
sched/fair: Change cpu iteration order in find_best_target()
sched/core: Add first cpu w/ max/min orig capacity to root domain
sched/core: Remove remnants of commit
fd5c98da1a42
sched: Remove sysctl_sched_is_big_little
sched/fair: Code !is_big_little path into select_energy_cpu_brute()
EAS: sched/fair: Re-integrate 'honor sync wakeups' into wakeup path
Fixup!: sched/fair.c: Set SchedTune specific struct energy_env.task
sched/fair: Energy-aware wake-up task placement
sched/fair: Add energy_diff dead-zone margin
sched/fair: Decommission energy_aware_wake_cpu()
sched/fair: Do not force want_affine eq. true if EAS is enabled
arm64: Set SD_ASYM_CPUCAPACITY sched_domain flag on DIE level
UPSTREAM: sched/fair: Fix incorrect comment for capacity_margin
UPSTREAM: sched/fair: Avoid pulling tasks from non-overloaded higher capacity groups
UPSTREAM: sched/fair: Add per-CPU min capacity to sched_group_capacity
UPSTREAM: sched/fair: Consider spare capacity in find_idlest_group()
UPSTREAM: sched/fair: Compute task/cpu utilization at wake-up correctly
UPSTREAM: sched/fair: Let asymmetric CPU configurations balance at wake-up
UPSTREAM: sched/core: Enable SD_BALANCE_WAKE for asymmetric capacity systems
UPSTREAM: sched/core: Pass child domain into sd_init()
UPSTREAM: sched/core: Introduce SD_ASYM_CPUCAPACITY sched_domain topology flag
UPSTREAM: sched/core: Remove unnecessary NULL-pointer check
UPSTREAM: sched/fair: Optimize find_idlest_cpu() when there is no choice
BACKPORT: sched/fair: Make the use of prev_cpu consistent in the wakeup path
UPSTREAM: sched/core: Fix power to capacity renaming in comment
Partial Revert: "WIP: sched: Add cpu capacity awareness to wakeup balancing"
Revert "WIP: sched: Consider spare cpu capacity at task wake-up"
FROM-LIST: cpufreq: schedutil: Redefine the rate_limit_us tunable
cpufreq: schedutil: add up/down frequency transition rate limits
trace/sched: add rq utilization signal for WALT
sched/cpufreq: make schedutil use WALT signal
sched: cpufreq: use rt_avg as estimate of required RT CPU capacity
cpufreq: schedutil: move slow path from workqueue to SCHED_FIFO task
BACKPORT: kthread: allow to cancel kthread work
sched/cpufreq: fix tunables for schedfreq governor
BACKPORT: cpufreq: schedutil: New governor based on scheduler utilization data
sched: backport cpufreq hooks from 4.9-rc4
ANDROID: Kconfig: add depends for UID_SYS_STATS
ANDROID: hid: uhid: implement refcount for open and close
Revert "ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY"
ANDROID: mnt: Fix next_descendent
Conflicts:
include/trace/events/sched.h
kernel/sched/Makefile
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h
Change-Id: I55318828f2c858e192ac7015bcf2bf0ec5c5b2c5
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Mon, 19 Jun 2017 23:42:06 +0000 (16:42 -0700)]
Merge "drm/msm : add hdcp debugfs nodes for DRM HDMI driver"
Linux Build Service Account [Mon, 19 Jun 2017 23:42:05 +0000 (16:42 -0700)]
Merge "f_gsi: Use kernel buffer instead of user space provided buffer"
Linux Build Service Account [Mon, 19 Jun 2017 23:42:04 +0000 (16:42 -0700)]
Merge "soc: qcom: glink: Move ctx initialization of xprt ptr"
Linux Build Service Account [Mon, 19 Jun 2017 23:42:03 +0000 (16:42 -0700)]
Merge "soc: qcom: glink_ssr: Remove subsystem_restart call"
Linux Build Service Account [Mon, 19 Jun 2017 23:42:02 +0000 (16:42 -0700)]
Merge "i2c-msm-v2: Print error logs in process context"
Linux Build Service Account [Mon, 19 Jun 2017 23:42:01 +0000 (16:42 -0700)]
Merge "ARM: dts: msm: Enable use of 64K page pool for SDM630"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:59 +0000 (16:41 -0700)]
Merge "qpnp-smb2: Fix QC_PULSE_COUNT reading logic"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:58 +0000 (16:41 -0700)]
Merge "ARM: dts: msm: Enable use of 64K page pool for SDM660"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:57 +0000 (16:41 -0700)]
Merge "Revert "msm: kgsl: Update QoS settings for A508 VBIF as recommended""
Linux Build Service Account [Mon, 19 Jun 2017 23:41:56 +0000 (16:41 -0700)]
Merge "msm: kgsl: Reset busy data after soft reset"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:55 +0000 (16:41 -0700)]
Merge "clk: qcom: Check for errors during RCG read"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:53 +0000 (16:41 -0700)]
Merge "defconfig: Enable TIF drivers in MSM8996 auto"
Linux Build Service Account [Mon, 19 Jun 2017 23:41:53 +0000 (16:41 -0700)]
Merge "msm: ba: Fix some potential risks"
Chris Lew [Mon, 19 Jun 2017 22:42:50 +0000 (15:42 -0700)]
diag: Update msg mask tables for new SSID
Update the diag headers and msg mask tables to account
for a new ssid group.
CRs-Fixed:
2055789
Change-Id: I3abd816d5e99bff263b753fb1070a2672ecea46c
Signed-off-by: Chris Lew <clew@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:49 +0000 (09:16 -0600)]
drm/msm: Move memptrs to msm_gpu and reorganize
Since most of the heavy lifting for managing submits lives in the
msm_gpu domain it makes sense to move the memptrs so that they are
globally visible and we can use them without relying on function
pointers.
Additionally, instead of having a single struct full of per-ring
arrays, reorganize the structure and assign a sub-allocation
to each ring. This simplifies all of the various macros and other
bits and allows us to make the size of the allocation dependent
on the acutal number of rings for the implementation.
Change-Id: Ic0dedbadc18ba1dc786c82b082c5030e13ff8012
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:49 +0000 (09:16 -0600)]
drm/msm: Attach the MMUs as soon as they are allocated
Currently the normal and secure MMUs are allocated when the
address space is created in msm_gpu_init() but not attached
until the end of adreno_gpu_init(). Since we can't map buffer
objects in the IOMMU without attaching it first this restricts
when we can allocate buffer objects in the sequence.
For arm-smmu based targets there isn't any reason why we can't
immediately attach the MMU after creating the address space -
this makes the whole system immediately available to map memory
and will facilitate moving around global allocations.
Change-Id: Ic0dedbad161396e9d095f3f3d1e4fca2d240a084
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:48 +0000 (09:16 -0600)]
drm/msm: Add a helper function for in-kernel buffer allocations
Nearly all of the buffer allocations for kernel allocate an buffer object,
virtual address and GPU iova at the same time. Make a helper function to
handle the details.
Change-Id: Ic0dedbad0ecd85d360895cc0d1e418277ba44c62
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:48 +0000 (09:16 -0600)]
drm/msm: Simplify ringbuffer cleanup
Cleanup and consolidate sanity checking on the ringbuffer
cleanup code.
Change-Id: Ic0dedbad551d36ca8ed3db56a4366a5008768791
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:47 +0000 (09:16 -0600)]
drm/msm: Remove superfluous hang check message
There are plenty of log messages when a hang check and/or fault
occurs there isn't any need to add one more - recovery is
pretty much a given at this point.
Change-Id: Ic0dedbad392807591b726eb9d09af3ad29d7bc30
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:47 +0000 (09:16 -0600)]
drm/msm: Add a submit queue flag to disable the QoS timer
Allow priviliged (CAP_SYS_ADMIN) processes to disable the
hangcheck / quality of service timer to allow individual
submits to run for as long as they need.
Change-Id: Ic0dedbad1399ebe7c6db74ba374bfa3a6f72917a
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 12 Jun 2017 15:16:46 +0000 (09:16 -0600)]
drm/msm: Add submit queue queries
Add the capability to query information from a submit queue.
The first available parameter is to query the number of GPU
faults that have been caused by the queue. The driver can
periodically query this value to see if it has caused a fault
and take action accordingly.
Change-Id: Ic0dedbadc68d5782c0b8b71d89722742aa6aaf1a
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Akshay Chandrashekhar Kalghatgi [Tue, 13 Jun 2017 04:34:16 +0000 (21:34 -0700)]
msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctl
Adding vidc support for VIDIOC_QUERY_EXT_CTRL ioctl. This ioctl will
return the details for the V4L2 control identified by the ID provided
by the user or the next supported control based upon the flags
provided by the user.
Change-Id: I68161ceb000a46a8e54333ab39c0229f8fbdbf72
Signed-off-by: Akshay Chandrashekhar Kalghatgi <akalghat@codeaurora.org>
Mayank Rana [Wed, 14 Jun 2017 20:38:57 +0000 (13:38 -0700)]
f_gsi: Use kernel buffer instead of user space provided buffer
gsi_ctrl_dev_write() and gsi_ctrl_dev_read() API is directly using user
space provided buffer when qti_packet_debug is enabled. This can result
into using untrusted buffer pointer. Hence use cpkt->buf i.e. kernel
space buffer pointer instead of directly using user space provided buffer.
CRs-Fixed:
2061391
Change-Id: Iba6f2845dae2755446b4b8e9f3041686877d7bc4
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Dhoat Harpal [Fri, 12 May 2017 15:03:21 +0000 (20:33 +0530)]
soc: qcom: glink: Move ctx initialization of xprt ptr
In glink_open function, channel context initialization with transport
pointer is done quite after after its creation. This create race condition,
if parallel thread try to use transport pointer of ctx.
Ctx is initialized with transport pointer right at the time of its
creation.
CRs-Fixed:
2061645
Change-Id: Idcddf1ab10b8673a20bc1f23d8702bf870f79dbd
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
Linux Build Service Account [Mon, 19 Jun 2017 14:54:18 +0000 (07:54 -0700)]
Merge "qdspv2: Add latency calculation support in pcm offload path"
Linux Build Service Account [Mon, 19 Jun 2017 14:54:17 +0000 (07:54 -0700)]
Merge "ASoC: wsa881x: Fix GPIO leak issue"
Linux Build Service Account [Mon, 19 Jun 2017 14:54:16 +0000 (07:54 -0700)]
Merge "ARM: dts: msm: Early mount of vendor partition for sdm660/630"
Linux Build Service Account [Mon, 19 Jun 2017 14:54:16 +0000 (07:54 -0700)]
Merge "ARM: dts: msm: Add Maxim regulator node for msm8996"
Linux Build Service Account [Mon, 19 Jun 2017 14:54:14 +0000 (07:54 -0700)]
Merge "ASoC: msm: Add Compressed app type in transcode loopback driver"
Linux Build Service Account [Mon, 19 Jun 2017 14:54:14 +0000 (07:54 -0700)]
Merge "msm:ipa: Fix to IPA static analysis constant null deferenced"
Linux Build Service Account [Mon, 19 Jun 2017 07:27:06 +0000 (00:27 -0700)]
Merge "defconfig: msm: Enable maxim regulator driver for msm8996-auto"
Linux Build Service Account [Mon, 19 Jun 2017 07:27:05 +0000 (00:27 -0700)]
Merge "drm: msm: Enable asynchronous driver probing"
Linux Build Service Account [Mon, 19 Jun 2017 07:27:04 +0000 (00:27 -0700)]
Merge "drm/msm : add utility function to dump HDMI registers"
Amit Nischal [Wed, 14 Jun 2017 05:15:46 +0000 (10:45 +0530)]
clk: qcom: Check for errors during RCG read
There could be instances where the RCG configuration update or readback
could fail. Notify the caller of the failure. Add support to change
scope of mux_div_get_src_div() in order to use it globally.
Change-Id: Ica07c28cede695785db81697effcb40ab6b717d4
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
Siddartha Shaik [Wed, 14 Jun 2017 06:33:35 +0000 (12:03 +0530)]
ASoC: msm: Add Compressed app type in transcode loopback driver
Pick proper app type for compressed input data port in
transcode loopback driver to support compressed input in
DSP loopback.
CRs-Fixed:
2061759
Change-Id: Ib2f66b467456787e08265a0da2bd85bb881a5d61
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
Siddartha Shaik [Wed, 14 Jun 2017 06:13:06 +0000 (11:43 +0530)]
ASoC: msm: Update mixer control for QUAT MI2S TX Format
DSP loopback uses QUAT MI2S TX as source interface
so mixer control is updated for QUAT MI2S TX Format
to support compressed and pcm input data formats.
CRs-Fixed:
2061759
Change-Id: I8c283de767f938ae8f4e1180a9dffc79a1da7ff0
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
Tirupathi Reddy [Fri, 19 May 2017 12:11:13 +0000 (17:41 +0530)]
ARM: dts: msm: Add Maxim regulator node for msm8996
Maxim20010 buck regulator is used to provide the supply for
graphics rail. The programmable output voltage range is from
0.5V to 1.27V in 10mV steps.
CRs-Fixed:
2062515
Change-Id: I50d3fe4c89f412cda2b58b3f1f19086edcf10553
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Tirupathi Reddy [Mon, 19 Jun 2017 03:18:05 +0000 (08:48 +0530)]
defconfig: msm: Enable maxim regulator driver for msm8996-auto
Enable Maxim20010 external buck regulator driver to provide the supply
for graphics rail on msm8996-auto boards.
CRs-Fixed:
2062515
Change-Id: I1e70f16c660de6d3d2a8c138a34157538c19f0f1
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Linux Build Service Account [Sun, 18 Jun 2017 23:31:16 +0000 (16:31 -0700)]
Merge "fbdev: msm: Reserve mixers with dspp for primary display"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:14 +0000 (16:31 -0700)]
Merge "ARM: dts: msm: optimize brightness dcs control for msm8998 SKUK HDK panel"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:13 +0000 (16:31 -0700)]
Merge "msm: mdss: Fix number accuracy for backlight to brightness"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:12 +0000 (16:31 -0700)]
Merge "msm: mdss: dp: use fixed NVID for VGA dongles"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:11 +0000 (16:31 -0700)]
Merge "msm: mdss: Add cursor validation for hflip"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:11 +0000 (16:31 -0700)]
Merge "fbdev: msm: fix issue preventing cursor_buf address to be stored"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:10 +0000 (16:31 -0700)]
Merge "fbdev: msm: fix unaligned access problem"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:09 +0000 (16:31 -0700)]
Merge "msm: mdss: validate number of cea blocks before reading from edid_buf"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:08 +0000 (16:31 -0700)]
Merge "msm: mdss: validate the buffer size before allocating memory"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:07 +0000 (16:31 -0700)]
Merge "msm: mdss: validate page id before reading from edid buffer"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:06 +0000 (16:31 -0700)]
Merge "msm: mdss: size check before writing to edid buffer"
Linux Build Service Account [Sun, 18 Jun 2017 23:31:05 +0000 (16:31 -0700)]
Merge "msm: mdss: handle vsync properly during dynamic resolution switch"
Linux Build Service Account [Sun, 18 Jun 2017 16:47:30 +0000 (09:47 -0700)]
Merge "msm: camera: isp: Do not update lpm mode for inactive streams."