diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 17:16:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 17:16:42 -0400 |
commit | 24a1635a41bccb5cc426eaef8b88c7e0961ef6bb (patch) | |
tree | eefc2f6d4a2bacd056d119d9331447e227bf5652 /drivers/dma-buf/sync_debug.c | |
parent | f79ec886f994918de057dd224fa2dfdc162bb3c3 (diff) | |
parent | 5896ec77d70d33dd38a455b0aa5f3154aeecea09 (diff) |
Merge tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"A bunch of fixes for rc2: two imx regressions, vc4 fix, dma-buf fix,
some displayport mst fixes, and an amdkfd fix.
Nothing too crazy, I assume we just haven't see much rc1 testing yet"
* tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux:
drm/mst: Avoid processing partially received up/down message transactions
drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
drm/mst: Fix error handling during MST sideband message reception
drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure
drm/imx: fix typo in ipu_plane_formats[]
drm/vc4: Fix VBLANK handling in crtc->enable() path
dma-buf/fence: Avoid use of uninitialised timestamp
drm/amdgpu: Remove unused field kgd2kfd_shared_resources.num_mec
drm/radeon: Remove initialization of shared_resources.num_mec
drm/amdkfd: Remove unused references to shared_resources.num_mec
drm/amdgpu: Fix KFD oversubscription by tracking queues correctly
Diffstat (limited to 'drivers/dma-buf/sync_debug.c')
-rw-r--r-- | drivers/dma-buf/sync_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c index 82a6e7f6d37f..59a3b2f8ee91 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c | |||
@@ -84,7 +84,7 @@ static void sync_print_fence(struct seq_file *s, | |||
84 | show ? "_" : "", | 84 | show ? "_" : "", |
85 | sync_status_str(status)); | 85 | sync_status_str(status)); |
86 | 86 | ||
87 | if (status) { | 87 | if (test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags)) { |
88 | struct timespec64 ts64 = | 88 | struct timespec64 ts64 = |
89 | ktime_to_timespec64(fence->timestamp); | 89 | ktime_to_timespec64(fence->timestamp); |
90 | 90 | ||