Commit graph

583447 commits

Author SHA1 Message Date
Linux Build Service Account
61284d06be Merge "ARM: dts: msm: Add SMB1351 device node for SDM660 QRD" 2017-02-23 21:35:50 -08:00
Linux Build Service Account
4c57c4181c Merge "ARM: dts: msm: changing memlat vote for min freq on SDM660" 2017-02-23 21:35:49 -08:00
Linux Build Service Account
4da238cbed Merge "ARM: dts: msm: Add touch device node for HDK835" 2017-02-23 21:35:48 -08:00
Linux Build Service Account
791f50a09d Merge "ARM: dts: msm: Enable support for GLINK QOS feature on msm8998" 2017-02-23 21:35:48 -08:00
Linux Build Service Account
f701481cfb Merge "MMC : card: check for card status incase of timeout error" 2017-02-23 21:35:47 -08:00
Linux Build Service Account
69bf85c82b Merge "ARM: dts: msm: add reg bus scale properties for sdm660 and sdm630" 2017-02-23 21:35:46 -08:00
Linux Build Service Account
67329e61e2 Merge "ARM: dts: msm: Update fuse corners supported for APC0/1 CPR for sdm630" 2017-02-23 21:35:45 -08:00
Linux Build Service Account
1569b17292 Merge "ARM: dts: msm: Add support for audio over USBC for SDM630" 2017-02-23 21:35:44 -08:00
Linux Build Service Account
4d40908715 Merge "ASoC: msm: qdsp6v2: Add INT3_MI2S interface for Source tracking" 2017-02-23 21:35:43 -08:00
Linux Build Service Account
0bb941eaed Merge "ASoC: codecs: Enable SSR for internal codec and WSA" 2017-02-23 21:35:42 -08:00
Linux Build Service Account
7e9aac208a Merge "ARM: dts: msm: Add routing controls for sdm660 internal codec" 2017-02-23 21:35:41 -08:00
Linux Build Service Account
60ebf2023c Merge "drm/msm: add support for 5V HPD pin for msm8998" 2017-02-23 21:35:36 -08:00
Linux Build Service Account
64190381d8 Merge "drm/msm: enable hpd event support for hdmi display" 2017-02-23 21:35:36 -08:00
Linux Build Service Account
6687ca759c Merge "drm/msm: add sde io util API support" 2017-02-23 21:35:35 -08:00
Linux Build Service Account
e2ef4360ab Merge "drm/sde: add support for customized mode" 2017-02-23 21:35:35 -08:00
Linux Build Service Account
097072f230 Merge "ARM: dts: msm: include SDE DTSI for MSM8998" 2017-02-23 21:35:34 -08:00
Linux Build Service Account
43de29b084 Merge "ARM: dts: msm: rename mdss_mdp to sde_kms and add HDMI TX device node" 2017-02-23 21:35:33 -08:00
Linux Build Service Account
e042032335 Merge "mhi: core: Add support for new MHI hardware channel" 2017-02-23 21:35:28 -08:00
Linux Build Service Account
9902e5e865 Merge "drm/msm: Get object iova from correct address space" 2017-02-23 21:35:15 -08:00
Linux Build Service Account
52f45fc339 Merge "drm/msm: Mark the microcode buffers as read-only" 2017-02-23 21:35:14 -08:00
Linux Build Service Account
f7e36cc621 Merge "drm/msm: Come out of secure before executing GPMU initialization" 2017-02-23 21:35:12 -08:00
Linux Build Service Account
ef49b42e4a Merge "drm/msm: Get and enable the IOMMU clocks" 2017-02-23 21:35:09 -08:00
Linux Build Service Account
fb98e68c1c Merge "drm/msm: Add hint to DRM_IOCTL_MSM_GEM_INFO to return an object IOVA" 2017-02-23 21:35:07 -08:00
Linux Build Service Account
b7ea8035cf Merge "msm: mdss: Install sync fences after user copy" 2017-02-23 21:35:06 -08:00
Sujeev Dias
fcfe80f8cc mhi: core: Add support for new MHI hardware channel
Add support for new MHI hardware channel 102 to be
use by MHI clients as ADPL channel.

CRs-Fixed: 1027069
Change-Id: Ib3c2019fc269064d097bb7f40f01d4580e63a603
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-02-22 18:15:58 -08:00
Sujeev Dias
219eb11023 mhi: core: Do not clear transaction status
MHI transaction status stores the OVERFLOW status
received from device.  MHI clients uses this
status to determine overflow buffers, do
not clear the status.

CRs-Fixed: 1042516
Change-Id: Iaaff06c1c39775d6a33ca17851f1e1579b2a2ecb
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-02-22 17:35:38 -08:00
Sujeev Dias
0f889f7e46 msm: mhi: Check bb ring and transfer ring when checking for space
When checking for available spaces, check available spaces on
both bounce buffer ring and transfer ring and return min.

Change-Id: I9208b46c32821de3f5d9e3d828087d7bc29b9546
CRs-Fixed: 1055681
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-02-22 13:12:22 -08:00
Sujeev Dias
3d25629c67 mhi: core: add missing MHI state
Add missing state MHI_STATE_RESERVE to MHI states
look up table.

CRs-Fixed: 1049595
Change-Id: I9a6bd2750f81f6cabc1e7b5aff488b4a01f7897d
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-02-22 13:03:13 -08:00
Sushmita Susheelendra
b4c63e6a5d drm/msm: Get object iova from correct address space
Get the iova for a buffer object from the context
specific address space instead of always defaulting
to the global address space.

Change-Id: Id38c2ca2d6bad334beab53d8bcf8eb5cf5b1bb99
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-02-22 09:52:36 -07:00
Jordan Crouse
950d7cce01 drm/msm: Return the current status of a fence for a timeout of 0
Return the current status of the fence (0 for retired, -EBUSY for
active) if an absolute timeout of 0 is passed to MSM_IOCTL_WAIT_FENCE.
This allows the user space to check the status of the fence without
an awkward timeout or an inadvertent kernel message.

Change-Id: Ic0dedbad66adfabed24aeb6692abb2765ee37f24
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:35 -07:00
Jordan Crouse
97c202c6d7 drm/msm: Mark the microcode buffers as read-only
The PFP/ME and GPMU memory needs to be GPU accessible but it
does not need to be written by the GPU. Mark them as read-only
to avoid corruption.

Change-Id: Ic0dedbadc848f0a6693a4e57567077bbab38e9a5
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:34 -07:00
Jordan Crouse
e5de360e6f drm/msm: Come out of secure before executing GPMU initialization
There isn't any need to be in secure mode when executing the GPMU
initalization so swap out to eliminate it as a variable when
GPMU init goes broken.

Change-Id: Ic0dedbad07b8cde80e257f71999002e9cbc47c24
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:33 -07:00
Jordan Crouse
8b98ed8588 drm/msm: Enable pm_runtime for the GPU
Enable pm_runtime for the GPU to keep power collapse from hitting
us while we expect the GPU to be powered.

Change-Id: Ic0dedbad693f1d01776a87bc7a145a65510ac3fb
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:33 -07:00
Jordan Crouse
9f8cd5dfb4 drm/msm: Get and enable the IOMMU clocks
If we do not enable the iommu clocks at attach time they might
be shut off automatically by other devices power collapsing which
would affect our ability to switch the pagetable dynamically.

There is little power downside to just leaving them on all the time,
or at least as long as the main device is attached (in other words,
all the time).

Change-Id: Ic0dedbad8f6d2ee2a2cb9516e062af2421d91052
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:32 -07:00
Jordan Crouse
4b508ebeb8 drm/msm: Fix the check for the command size
The overrun check for the size of submitted commands is off by one.
It should allow the offset plus the size to be equal to the
size of the memory object when the command stream is very tightly
constructed.

Change-Id: Ic0dedbadec41fb8be84d7522b4dc923dbd537ce5
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:31 -07:00
Jordan Crouse
20e281de48 drm/msm: Add support for the QTI GPU snapshot format
When a fault happens on the Adreno GPU we want to collect
a considerable amount of information to diagnose the problem
including registers, caches, and GPU memory structures (ringbuffers,
etc).

The snapshot collects all of this information following a GPU fault
and encodes it into a binary file format that can be pulled from
debugfs or extracted from a memory dump.

This may seem a duplication of other debug methods (the ->show
functions for example) and while that is true for small numbers
of registers the snapshot goes much further - it collects hundreds
(thousands) of registers in addition to memory and other structures
that would be impractical to dump as ascii. The binary format allows
for the snapshot to be easily shared and post-processed in different
ways to extract patterns.

Add the basic snapshot infrastructure and enable ringbuffer, register
and shader bank collection for A5XX targets.

Change-Id: Ic0dedbadcf0513096d05870f522ac73da74ceb31
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:30 -07:00
Jordan Crouse
869486c969 drm/msm: Allow hardware clock gating to be toggled
There are some use cases wherein we need to turn off hardware clock
gating before reading certain registers. Modify the A5XX HWCG function
to allow user to enable or disable clock gating at will.

Change-Id: Ic0dedbade1264785b3436099e638a5678a62818f
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:30 -07:00
Jordan Crouse
7110a92f3d drm/msm: Update the list of A5XX registers
Update the list of the A5XX register ranges that can be read on a
hang. The new list adds some registers that were previously missed,
and omits registers that are write only.

Change-Id: Ic0dedbadaf6969892c0563d9cfd8fa2869008417
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:29 -07:00
Jordan Crouse
8268f30aeb msm/drm: Dynamically locate the clocks from the device tree
Instead of using a fixed list of clock names, use the clock-names
list in the device tree to discover and get the list of clocks
that we need.

Change-Id: Ic0dedbad629743ff078177c301ffda3dbce88d3c
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:28 -07:00
Jordan Crouse
75bc0cc55c drm/msm: Reference count address spaces
There are reasons for a memory object to outlive the file descriptor
that created it and so the address space that a buffer object is
attached to must also outlive the file descriptor. Reference count
the address space so that it can remain viable until all the objects
have released their addresses.

Change-Id: Ic0dedbad3769801b62152d81b37f2f43f962d308
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:28 -07:00
Jordan Crouse
64eeed7a4b drm/msm: Support per-instance pagetables
Support per-instance pagetables for 5XX targets. Per-instance
pagetables allow each open DRM instance to have its own VM memory
space to prevent accidently or maliciously copying or overwriting
buffers from other instances. It also opens the door for SVM since
any given CPU side address can be more reliably mapped into the
instance's GPU VM space without conflict.

To support this create a new dynamic domain (pagetable) for each open
DRM file and map buffer objects for each instance into that pagetable.
Use the GPU to switch to the pagetable for the instance while doing a
submit.

Change-Id: Ic0dedbad22d157d514ed1628b83e8cded5490dec
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:27 -07:00
Jordan Crouse
7591b1ab7d drm/msm: Support dynamic IOMMU domains
Dynamic IOMMU domains allow multiple pagetables to be attached to the
same IOMMU device. These can be used by smart devices like the GPU
that can switch the pagetable dynamically between DRM instances.

Add support for dynamic IOMMU domains if they are enabled and
supported by your friendly neighborhood IOMMU driver.

Change-Id: Ic0dedbaded3a9e57a7fbb8e745c44c183f6b4655
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:26 -07:00
Jordan Crouse
231c57eeaf drm/msm: Pass the MMU domain index in struct msm_file_private
Pass the index of the MMU domain in struct msm_file_private instead
of assuming gpu->id throughout the submit path.

Change-Id: Ic0dedbad3761b0f72ad6b1789f69458896214239
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:25 -07:00
Jordan Crouse
663d4c0a64 iommu/arm-smmu: Add support for TTBR1
Allow a domain to opt into allocating and maintaining a TTBR1
pagetable.  The size of the TTBR1 region will be the same as
the TTBR0 size with the sign extension bit set on the highest
bit in the region.

By example, given a TTBR0/TTBR1 virtual address range of 36
bits the memory map will look like this:

   TTBR0 [0x000000000:0x7FFFFFFFF]
   TTBR1 [0x800000000:0xFFFFFFFFF]

The map/unmap operations will automatically use the appropriate
pagetable for the given iova.

Change-Id: Ic0dedbad2b2c58cd9c47ce31356472e0463d4228
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:25 -07:00
Jordan Crouse
40b74543b5 drm/msm: a5xx: Enable 64 bit mode by default
A5XX GPUs can be run in either 32 or 64 bit mode. The GPU registers
and the microcode use 64 bit virtual addressing by default but the
upper 32 bits are ignored if the GPU is in 32 bit mode. There is no
performance disadvantage to remaining in 64 bit mode even if we are
only generating 32 bit addresses so switch over now to prepare for
possibly using addresses above 4G for those targets that support them.

Change-Id: Ic0dedbad7e527c4b1fe87878e943619c5e0ad869
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:24 -07:00
Jordan Crouse
b9148c855a drm/msm: Add a struct to pass configuration to msm_gpu_init()
The amount of information that we need to pass into msm_gpu_init()
is steadily increasing, so add a new struct to stabilize the function
call and make it easier to add new configuration down the line.

Change-Id: Ic0dedbad6c62d6859c90764245437c222d61f00d
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:23 -07:00
Jordan Crouse
3b045f8fff drm/msm: Implement preemption for A5XX targets
Implement preemption for A5XX targets - this allows multiple
ringbuffers for different priorities with automatic preemption
of a lower priority ringbuffer if a higher one is ready.

Change-Id: Ic0dedbad428360d23768d52b585021237c6bc3d3
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:22 -07:00
Jordan Crouse
425372c0ba drm/msm: Set IOMMU map attributes
Remove the IOMMU_WRITE bit from buffer objects that are
marked MSM_BO_GPU_READONLY.  Add a new flag (MSM_BO_PRIVILEGED)
to pass through IOMMU_PRIV for those IOMMU targets that support
it.

Change-Id: Ic0dedbad8d9d3f461a47ea093fad3fdd90f46535
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:22 -07:00
Jordan Crouse
76eb0ae231 drm/msm: Make the value of RB_CNTL (almost) generic
We use a global ringbuffer size and block size for all targets and
at least for 5XX preemption we need to know the value the RB_CNTL
in several locations so it makes sense to caculate it once and use
it everywhere.

The only monkey wrench is that we need to disable the RPTR shadow
for A430 targets but that only needs to be done once and doesn't
affect A5XX so we can or in the value at init time.

Change-Id: Ic0dedbadca31e835f014037ea3f9741048df3b98
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:21 -07:00
Jordan Crouse
64e3375be2 drm/msm: Shadow current pointer in the ring until command is complete
Add a shadow pointer to track the current command being written into
the ring. Don't commit it as 'cur' until the command is submitted.
Because 'cur' is used to construct the software copy of the wptr this
ensures that somebody peeking in on the ring doesn't assume that a
command is inflight while it is being written. This isn't a huge deal
with a single ring (though technically the hangcheck could assume
the system is prematurely busy when it isn't) but it will be rather
important for preemption where the decision to preempt is based
on a non-empty ringbuffer. Without a shadow an aggressive preemption
scheme could assume that the ringbuffer is non empty and switch to it
before the CPU is done writing the command and boom.

Even though preemption won't be supported for all targets because of
the way the code is organized it is simpler to make this generic for
all targets. The extra load for non-preemption targets should be
minimal.

Change-Id: Ic0dedbad83247c3e77de6f4f24bbb97db10e5edd
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-02-22 09:52:20 -07:00