Commit graph

25314 commits

Author SHA1 Message Date
Guchun Chen
ae94b477af msm: smmu: add re-route calling for specified iova.
When calling smmu mapping, if iova is specified directly by user, not
allocated dynamically in dma-mapping.c, smmu driver needs to provide
support for this. This is needed in early display case. In this scenario,
LK has set physical memory to display hardware for fetching, so if iova
is not explicitly specified in kernel, but instead dynamically produced
by "alloc_iova" in dma-mapping.c, display hardware has no chance to know
this new iova, then smmu fault will happen if enabling the iommu stage-1
translation.
To fix this smmu fault problem, add re-routing to the right path when
iova specified by user is not 0 in smmu map/unmap function.

Change-Id: I062b04d7eec65af1c106a5caa09ec787b5d26d0d
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-06-02 09:50:41 +08:00
Linux Build Service Account
e0b49f46ed Merge "msm: kgsl: Use per page cache operation instead of bulk cache operation" 2017-06-01 16:56:02 -07:00
wyun
68b757f5de drm/sde: add 4k hdmi support
When HDMI resolution is bigger than 2560 pixel of width, driver
needs to use two hardware pipes. Use virtual plane to support this feature.

Change-Id: I19e3bb32aa2a16c83393b0e3c6bec3db03827eca
Signed-off-by: wyun <wyun@codeaurora.org>
2017-06-01 10:24:21 -04:00
Sushmita Susheelendra
48d9d351eb drm: Remove redundant variable assignment
The variable 'end' is computed twice. Remove the
redundant assignment.

Change-Id: I79802b5f08aa10146b113d14ab40f33f6fefe6dc
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 17:33:11 -06:00
Chris Wilson
ffc435160c drm: Declare that create drm_mm nodes with size 0 is illegal
At a higher level, all objects are created with definite size i.e. 0 is
illegal. In forthcoming patches, this assumption is dependent upon in
the drm_mm range manager, i.e. trying to create a drm_mm node with size
0 will have undefined behaviour. Add a couple of WARNs upon creating the
drm_mm node to prevent later bugs.

Change-Id: Ieb81a8ef5a05a32dd37dfc040ea3f78243b59161
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1470248788-30873-1-git-send-email-chris@chris-wilson.co.uk
Git-commit: aafdcfd3f9aa3c9f77ae4e9385f21bf9ae120d3e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 17:33:10 -06:00
Chris Wilson
e4cf5a0425 drm: Skip initialising the drm_mm_node->hole_stack
As we always add this to the drm_mm->hole_stack as our first operation,
we do not need to initialise the list node.

Change-Id: If2e9e06141bdb9a9411ef875cb83e41a48e5f1a9
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1470236651-678-3-git-send-email-chris@chris-wilson.co.uk
Git-commit: a787900564ffc6eebbcb7086b45e04a0bc3370f0
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 17:33:09 -06:00
Chris Wilson
32d840be56 drm: Track drm_mm nodes with an interval tree
In addition to the last-in/first-out stack for accessing drm_mm nodes,
we occasionally and in the future often want to find a drm_mm_node by an
address. To do so efficiently we need to track the nodes in an interval
tree - lookups for a particular address will then be O(lg(N)), where N
is the number of nodes in the range manager as opposed to O(N).
Insertion however gains an extra O(lg(N)) step for all nodes
irrespective of whether the interval tree is in use. For future i915
patches, eliminating the linear walk is a significant improvement.

v2: Use generic interval-tree template for u64 and faster insertion.

Change-Id: Iddcb7891480ca7d6e0469c8d394fcd1962ed4583
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1470236651-678-1-git-send-email-chris@chris-wilson.co.uk
Git-commit: 202b52b7fbf70858609ec20829c7d69a13ffa351
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 17:33:09 -06:00
Sushmita Susheelendra
9c0d1dc8c0 drm/msm: Separate locking of buffer resources from struct_mutex
Buffer object specific resources like pages, domains, sg list
need not be protected with struct_mutex. They can be protected
with a buffer object level lock. This simplifies locking and
makes it easier to avoid potential recursive locking scenarios
for SVM involving mmap_sem and struct_mutex. This also removes
unnecessary serialization when creating buffer objects, and also
between buffer object creation and GPU command submission.

Change-Id: I40cb437d0186c3d9aac365c9baba0aa4792f0aa1
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 17:33:08 -06:00
Sushmita Susheelendra
855e0a4c1c drm/msm: Set the TTBR1 range for a 36-bit address space
Define a 36-bit address space for TTBR1 which is used for
kernel side GPU buffer objects.

Change-Id: I1c4eaee0fd92236793621c7d3dba1700e56fefd2
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-05-31 12:00:54 -06:00
Prakash Kamliya
0bcaa07af2 drm/msm: fix leak in failed get_pages
get_pages doesn't keep a reference of the pages allocated
when it fails later in the code path. This can lead to
a memory leak. Keep reference of the allocated pages so
that it can be freed when msm_gem_free_object gets called
later during cleanup.

Change-Id: I44dea20e10c056c1c5e80d01bab0a274ff768b1c
Signed-off-by: Prakash Kamliya <pkamliya@codeaurora.org>
2017-05-31 15:36:34 +05:30
Kasin Li
a61bcfad32 drm/msm: Fix potential buffer overflow issue
In function submit_create, if nr_cmds or nr_bos is assigned with
negative value, the allocated buffer may be small than intended.
Using this buffer will lead to buffer overflow issue.

Change-Id: I0b61cccffd836e2dd3c859446470af4b6451b9ed
Signed-off-by: Kasin Li <donglil@codeaurora.org>
2017-05-31 10:58:19 +08:00
Linux Build Service Account
881828b004 Merge "msm: kgsl: Deal with a NULL pointer when creating default pagetable" 2017-05-26 14:09:09 -07:00
Linux Build Service Account
b52ce7f7b9 Merge "msm: kgsl: Update QoS settings for A508 VBIF as recommended" 2017-05-26 06:31:06 -07:00
Linux Build Service Account
3ac136c40b Merge "drm/msm: profile submit_time in nanosecond resolution" 2017-05-26 06:30:47 -07:00
Lynus Vaz
5ea16d78cc msm: kgsl: Deal with a NULL pointer when creating default pagetable
Return an appropriate error code if the default pagetable is NULL.

Change-Id: Ic88b066c40a8f840d95fd3fbc9ee9274c428b66a
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-05-26 05:37:37 -07:00
Deepak Kumar
7490d55401 msm: kgsl: Use per page cache operation instead of bulk cache operation
For any cache operation, the current code tries to map all pages to the
kernel using vmap in case sg table is not available and then performs
the requested cache operation. If vmap fails because of memory crunch
ioctl just returns failure.

This change avoids using vmap and performs per page cache operation
even when sg table is not available. This is done to avoid failures
because of vmap especially on 32 bit systems.

Change-Id: I123b46e6a55a62cbf934ab6a2a49dcd1f0d4c7d4
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-05-26 12:55:07 +05:30
Linux Build Service Account
a24cba4428 Merge "drm/msm: add irq mapping for cec in hdmi driver" 2017-05-26 00:09:47 -07:00
Linux Build Service Account
c5685ec0f3 Merge "msm: kgsl: Return mementry only if pending_free is not set" 2017-05-25 15:52:15 -07:00
Linux Build Service Account
93f01bb760 Merge "msm: kgsl: Don't delete uninitialized preemption timer" 2017-05-25 15:52:05 -07:00
Linux Build Service Account
8a4a2650e0 Merge "drm/sde: only set split registers for DSI interfaces" 2017-05-25 15:51:50 -07:00
Linux Build Service Account
599b4011d6 Merge "drm/msm: wait fence complete before flip" 2017-05-25 15:51:48 -07:00
Linux Build Service Account
3964778c1a Merge "Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4" 2017-05-25 15:51:39 -07:00
Linux Build Service Account
c63ad80553 Merge "drm/msm: deal with arbitrary # of cmd buffers" 2017-05-25 15:51:31 -07:00
Mario Kleiner
da922dc48d drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
commit e345da82bd6bdfa8492f80b3ce4370acfd868d95 upstream.

The builtin eDP panel in the HP zBook 17 G2 supports 10 bpc,
as advertised by the Laptops product specs and verified via
injecting a fixed edid + photometer measurements, but edid
reports unknown depth, so drivers fall back to 6 bpc.

Add a quirk to get the full 10 bpc.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1492787108-23959-1-git-send-email-mario.kleiner.de@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:17 +02:00
Ben Skeggs
e4add1cf6b drm/nouveau/tmr: handle races with hw when updating the next alarm time
commit 1b0f84380b10ee97f7d2dd191294de9017e94d1d upstream.

If the time to the next alarm is short enough, we could race with HW and
end up with an ~4 second delay until it triggers.

Fix this by checking again after we update HW.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Ben Skeggs
9d78e40f5f drm/nouveau/tmr: avoid processing completed alarms when adding a new one
commit 330bdf62fe6a6c5b99a647f7bf7157107c9348b3 upstream.

The idea here was to avoid having to "manually" program the HW if there's
a new earliest alarm.  This was lazy and bad, as it leads to loads of fun
races between inter-related callers (ie. therm).

Turns out, it's not so difficult after all.  Go figure ;)

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Ben Skeggs
5e07724c28 drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm
commit 9fc64667ee48c9a25e7dca1a6bcb6906fec5bcc5 upstream.

At least therm/fantog "attempts" to work around this issue, which could
lead to corruption of the pending alarm list.

Fix it properly by not updating the timestamp without the lock held, or
trying to add an already pending alarm to the pending alarm list....

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Ben Skeggs
27f82df2f0 drm/nouveau/tmr: ack interrupt before processing alarms
commit 3733bd8b407211739e72d051e5f30ad82a52c4bc upstream.

Fixes a race where we can miss an alarm that triggers while we're already
processing previous alarms.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Ben Skeggs
3819271d8a drm/nouveau/therm: remove ineffective workarounds for alarm bugs
commit e4311ee51d1e2676001b2d8fcefd92bdd79aad85 upstream.

These were ineffective due to touching the list without the alarm lock,
but should no longer be required.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Mario Kleiner
7d2d602280 drm/amdgpu: Make display watermark calculations more accurate
commit d63c277dc672e0c568481af043359420fa9d4736 upstream.

Avoid big roundoff errors in scanline/hactive durations for
high pixel clocks, especially for >= 500 Mhz, and thereby
program more accurate display fifo watermarks.

Implemented here for DCE 6,8,10,11.
Successfully tested on DCE 10 with AMD R9 380 Tonga.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:10 +02:00
Mario Kleiner
349666cfbe drm/amdgpu: Avoid overflows/divide-by-zero in latency_watermark calculations.
commit e190ed1ea7458e446230de4113cc5d53b8dc4ec8 upstream.

At dot clocks > approx. 250 Mhz, some of these calcs will overflow and
cause miscalculation of latency watermarks, and for some overflows also
divide-by-zero driver crash ("divide error: 0000 [#1] PREEMPT SMP" in
"dce_v10_0_latency_watermark+0x12d/0x190").

This zero-divide happened, e.g., on AMD Tonga Pro under DCE-10,
on a Displayport panel when trying to set a video mode of 2560x1440
at 165 Hz vrefresh with a dot clock of 635.540 Mhz.

Refine calculations to avoid the overflows.

Tested for DCE-10 with R9 380 Tonga + ASUS ROG PG279 panel.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-25 14:30:09 +02:00
Ray Zhang
aabbd64ef4 drm/msm: add irq mapping for cec in hdmi driver
Make HDMI device as the interrupt parent of CEC device, so add
the new IRQ domain in HDMI driver dealing with the necessary
IRQ mapping.

Change-Id: Id935da1d1e488ccee01b831b9f085a83d67268f2
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-25 15:32:04 +08:00
Rajesh Kemisetti
ef93af2324 msm: kgsl: Update QoS settings for A508 VBIF as recommended
Update QoS settings for A508 VBIF based on recommendation.
VBIF_GATE_OFF_WRREQ_EN register needs to be programmed by SW.

Change-Id: I7d41c8350ad09c595f288bd2a2b45fc2abef15f8
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2017-05-25 11:39:25 +05:30
Deepak Kumar
0e42ef24c9 msm: kgsl: Return mementry only if pending_free is not set
Return mementry from kgsl_sharedmem_find only if pending_free
is not set for that mementry. This is necessary to avoid use
of a mementry after it is already marked for free.

Change-Id: I23111e9c82a88ccbda2ab259074c38d91f9ff5cb
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-05-23 02:56:36 -07:00
Wenbin Wang
bd15fce5df msm: kgsl: Don't delete uninitialized preemption timer
If we delete uninitialized timer on CONFIG_DEBUG_OBJECTS
disabled build del_timer_sync() will block for ever. For
all A3xx targets preemption timer is not initialized, but
dispatcher fault handler is trying to delete the
uninitialized preemption timer. Fix this issue by adding
a preemption check before we delete it.

CRs-Fixed: 2023690
Change-Id: I2c51a0b2286b82bf2eb5ee68d923dd9585f07f00
Signed-off-by: Wenbin Wang <wwenbin@codeaurora.org>
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-05-22 21:57:50 -07:00
Linux Build Service Account
bd4d7e0de5 Merge "drm/msm: Don't allow zero sized buffer objects" 2017-05-20 01:37:11 -07:00
Linux Build Service Account
211854c904 Merge "drm/msm: remove mdp node entry" 2017-05-16 06:49:50 -07:00
Linux Build Service Account
2fdf1c893d Merge "drm/msm: drop return from gpu->submit()" 2017-05-16 06:49:34 -07:00
Linux Build Service Account
f7b2efad8d Merge "msm: kgsl: Offload mementry destroy work to separate thread" 2017-05-16 06:49:29 -07:00
Jin Li
54133d0b7d drm/msm: wait fence complete before flip
In async commit case, driver needs to always wait for input fence
before triggering the complete_commit path. Otherwise, there could
be tearing since GPU hasn't finished the composition rendering.

Change-Id: I73a54f5811fdcf8639618ce3cacf4cbaa00b406c
Signed-off-by: Felix Xiong <xayang@codeaurora.org>
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
2017-05-16 18:09:03 +08:00
Kyle Yan
373b13c83b Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4
* origin/tmp-285c137:
  Linux 4.4.68
  block: get rid of blk_integrity_revalidate()
  drm/ttm: fix use-after-free races in vm fault handling
  f2fs: sanity check segment count
  bnxt_en: allocate enough space for ->ntp_fltr_bmap
  ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf
  ipv6: initialize route null entry in addrconf_init()
  rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
  ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
  tcp: do not inherit fastopen_req from parent
  tcp: fix wraparound issue in tcp_lp
  bpf, arm64: fix jit branch offset related to ldimm64
  tcp: do not underestimate skb->truesize in tcp_trim_head()
  ALSA: hda - Fix deadlock of controller device lock at unbinding
  staging: emxx_udc: remove incorrect __init annotations
  staging: wlan-ng: add missing byte order conversion
  brcmfmac: Make skb header writable before use
  brcmfmac: Ensure pointer correctly set if skb data location changes
  MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix
  scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
  serial: 8250_omap: Fix probe and remove for PM runtime
  phy: qcom-usb-hs: Add depends on EXTCON
  USB: serial: io_edgeport: fix descriptor error handling
  USB: serial: mct_u232: fix modem-status error handling
  USB: serial: quatech2: fix control-message error handling
  USB: serial: ftdi_sio: fix latency-timer error handling
  USB: serial: ark3116: fix open error handling
  USB: serial: ti_usb_3410_5052: fix control-message error handling
  USB: serial: io_edgeport: fix epic-descriptor handling
  USB: serial: ssu100: fix control-message error handling
  USB: serial: digi_acceleport: fix incomplete rx sanity check
  USB: serial: keyspan_pda: fix receive sanity checks
  usb: chipidea: Handle extcon events properly
  usb: chipidea: Only read/write OTGSC from one place
  usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
  usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
  KVM: nVMX: do not leak PML full vmexit to L1
  KVM: nVMX: initialize PML fields in vmcs02
  Revert "KVM: nested VMX: disable perf cpuid reporting"
  x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
  kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
  clk: Make x86/ conditional on CONFIG_COMMON_CLK
  x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
  x86/ioapic: Restore IO-APIC irq_chip retrigger callback
  mwifiex: Avoid skipping WEP key deletion for AP
  mwifiex: remove redundant dma padding in AMSDU
  mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
  ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
  leds: ktd2692: avoid harmless maybe-uninitialized warning
  power: supply: bq24190_charger: Handle fault before status on interrupt
  power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread()
  power: supply: bq24190_charger: Call power_supply_changed() for relevant component
  power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()
  power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
  power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING
  powerpc/powernv: Fix opal_exit tracepoint opcode
  cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
  ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode
  9p: fix a potential acl leak
  ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line
  ANDROID: memory_state_time: fix undefined behavior with missing DT properties
  ANDROID: rfkill: fix unused function warning
  ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
  ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
  ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG
  ANDROID: sdcardfs: Don't iput if we didn't igrab
  ANDROID: Add untag hacks to inet_release function

Change-Id: I6d750f8bb186774ff9630beeb0ed8e680af26231
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-05-15 05:09:49 -07:00
Jin Li
9894f9ab8f drm/sde: only set split registers for DSI interfaces
The SPLIT related registers are only for DSI interfaces. Without
checking the interface type, they could be overwrote by
configurations through HDMI path.

CRs-Fixed: 1085586
Change-Id: I7ace9fd8dfe5ee99cb750b2723e8f22701039552
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
2017-05-15 15:54:32 +08:00
Jin Li
ee02df530d drm/sde: set display h/v polarity according to panel info
The h/v polarity should always be set from the panel configuration.
For HDMI display, it's from the EDID information. For DSI display,
it's from the panel settings in the dtsi.

CRs-Fixed: 1085021
Change-Id: I3776603d7055e69eb2c8e5003ab83bc0483ab7c8
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
2017-05-15 15:51:12 +08:00
Sharat Masetty
c22f7e9569 drm/msm: profile submit_time in nanosecond resolution
The initial version of the patch save the command submit_time and
queue_time in seconds, but its desired by the users of this profiling
API to return the time in nanoseconds resolution.

Change-Id: I3a56e3ffd3ebe86f51a00a12b7c3e7c4b4c9a956
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
2017-05-15 12:03:19 +05:30
Rob Clark
e2135a7627 drm/msm: drop return from gpu->submit()
At this point, there is nothing left to fail.  And submit already has a
fence assigned and is added to the submit_list.  Any problems from here
on out are asynchronous (ie. hangcheck/recovery).

Change-Id: Ib6b6bf00099137972649c97cc6cd8c4fe25ce7c3
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-commit: 1193c3bcb581807d58dd7df90528ec744af387a9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[smasetty@codeaurora.org: fixed merge conflict issues; made corresponding
changes to A5XX submit function.]
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
2017-05-15 11:16:11 +05:30
Nicolai Hähnle
60e3f5a916 drm/ttm: fix use-after-free races in vm fault handling
commit 3089c1df10e2931b1d72d2ffa7d86431084c86b3 upstream.

The vm fault handler relies on the fact that the VMA owns a reference
to the BO. However, once mmap_sem is released, other tasks are free to
destroy the VMA, which can lead to the BO being freed. Fix two code
paths where that can happen, both related to vm fault retries.

Found via a lock debugging warning which flagged &bo->wu_mutex as
locked while being destroyed.

Fixes: cbe12e74ee ("drm/ttm: Allow vm fault retries")
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-14 13:32:59 +02:00
Linux Build Service Account
a55a52a8a2 Merge "drm/msm: Allocate secure buffer objects" 2017-05-11 11:48:34 -07:00
Deepak Kumar
281fcb5e18 msm: kgsl: Offload mementry destroy work to separate thread
Any memory free ioctl doesn't need to be blocked till the
corresponding mementry is destroyed. This change defers
the mementry put to unblock all memory free ioctls immediately.
This is done to reduce the time spent by user applications in
waiting for memory to be freed.

Change-Id: Iaa37ac5dbdedc3d02c41886c2bdf7f3d016176ac
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-05-11 17:48:44 +05:30
Linux Build Service Account
3a360dc173 Merge "drm/msm/sde: avoid adding plane states in crtc atomic check" 2017-05-10 23:04:06 -07:00
Linux Build Service Account
05eae98b38 Merge "drm/msm/sde: move topology name reset to release resources" 2017-05-10 23:03:59 -07:00