mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJaCm8RAAoJEAx081l5xIa+zX0QAJSm31kCG3vdw2CNiRx25L3q 3hcsEOgAjVJ9FQVGKFWjzb8TK35tSqtNx5kWIj0VGaIfBE5Bdg5SLLgKKUYas8rY 4LaphqICq2uxu2BNa2tpiar/sHhAnuozwQ4czpVWXzlaISnb9yYzRl7gMuyUVGkx +Gih5VUhLmQC0HsRTLJ3vaZQoUsLAl2gAjKcWa1bx57j2S+iKOPfsLaq7VYo+y1I Njc+iSGqMhJzRLXVkxL2lQKaslp7R38Bbh5K4Kvyjkm4Aq7zErOF6irpOXKMcrGl mwnr89vf1G9thjikrBaXpKnuvdbWYveoN/ORMlTdCfxkFnChHLnm3bd7NJ49RXDN Hv/Iq9YYjmZ9GTatxnx7lWtmXnZXC5he1yn1JAuz/yt7/0b/Wx+Mu/wEpBXYNFTd 1AZdD586i+AmPo3yDkqH9nBu8JC0W0AnS9VZma4LVvZOP2UfJmj5Im1CLHItbGDN FnUCkwyD/lJUUk+WgT+w/GOMJgmFHDiFFl4tFtYVVjrUirpCFVguSKG9xuv6tT8P 8iRsoP7RrcmDN9ojN2SEHwcpsAv3HnKkDv+9+GIbWnrGsSbCPq8Qm+JDSvf4h22I K5lwNpJrcpSKI+q10L7w2xliTBwb98sJkWGA/rssomrdBOWteGZAyqFRYAVgQ+mJ x/nJurIqQYh2KQN9+uLG =xVV2 -----END PGP SIGNATURE----- Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux Pull drm updates from Dave Airlie: "This is the main drm pull request for v4.15. Core: - Atomic object lifetime fixes - Atomic iterator improvements - Sparse/smatch fixes - Legacy kms ioctls to be interruptible - EDID override improvements - fb/gem helper cleanups - Simple outreachy patches - Documentation improvements - Fix dma-buf rcu races - DRM mode object leasing for improving VR use cases. - vgaarb improvements for non-x86 platforms. New driver: - tve200: Faraday Technology TVE200 block. This "TV Encoder" encodes a ITU-T BT.656 stream and can be found in the StorLink SL3516 (later Cortina Systems CS3516) as well as the Grain Media GM8180. New bridges: - SiI9234 support New panels: - S6E63J0X03, OTM8009A, Seiko 43WVF1G, 7" rpi touch panel, Toshiba LT089AC19000, Innolux AT043TN24 i915: - Remove Coffeelake from alpha support - Cannonlake workarounds - Infoframe refactoring for DisplayPort - VBT updates - DisplayPort vswing/emph/buffer translation refactoring - CCS fixes - Restore GPU clock boost on missed vblanks - Scatter list updates for userptr allocations - Gen9+ transition watermarks - Display IPC (Isochronous Priority Control) - Private PAT management - GVT: improved error handling and pci config sanitizing - Execlist refactoring - Transparent Huge Page support - User defined priorities support - HuC/GuC firmware refactoring - DP MST fixes - eDP power sequencing fixes - Use RCU instead of stop_machine - PSR state tracking support - Eviction fixes - BDW DP aux channel timeout fixes - LSPCON fixes - Cannonlake PLL fixes amdgpu: - Per VM BO support - Powerplay cleanups - CI powerplay support - PASID mgr for kfd - SR-IOV fixes - initial GPU reset for vega10 - Prime mmap support - TTM updates - Clock query interface for Raven - Fence to handle ioctl - UVD encode ring support on Polaris - Transparent huge page DMA support - Compute LRU pipe tweaks - BO flag to allow buffers to opt out of implicit sync - CTX priority setting API - VRAM lost infrastructure plumbing qxl: - fix flicker since atomic rework amdkfd: - Further improvements from internal AMD tree - Usermode events - Drop radeon support nouveau: - Pascal temperature sensor support - Improved BAR2 handling - MMU rework to support Pascal MMU exynos: - Improved HDMI/mixer support - HDMI audio interface support tegra: - Prep work for tegra186 - Cleanup/fixes msm: - Preemption support for a5xx - Display fixes for 8x96 (snapdragon 820) - Async cursor plane fixes - FW loading rework - GPU debugging improvements vc4: - Prep for DSI panels - fix T-format tiling scanout - New madvise ioctl Rockchip: - LVDS support omapdrm: - omap4 HDMI CEC support etnaviv: - GPU performance counters groundwork sun4i: - refactor driver load + TCON backend - HDMI improvements - A31 support - Misc fixes udl: - Probe/EDID read fixes. tilcdc: - Misc fixes. pl111: - Support more variants adv7511: - Improve EDID handling. - HDMI CEC support sii8620: - Add remote control support" * tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux: (1480 commits) drm/rockchip: analogix_dp: Use mutex rather than spinlock drm/mode_object: fix documentation for object lookups. drm/i915: Reorder context-close to avoid calling i915_vma_close() under RCU drm/i915: Move init_clock_gating() back to where it was drm/i915: Prune the reservation shared fence array drm/i915: Idle the GPU before shinking everything drm/i915: Lock llist_del_first() vs llist_del_all() drm/i915: Calculate ironlake intermediate watermarks correctly, v2. drm/i915: Disable lazy PPGTT page table optimization for vGPU drm/i915/execlists: Remove the priority "optimisation" drm/i915: Filter out spurious execlists context-switch interrupts drm/amdgpu: use irq-safe lock for kiq->ring_lock drm/amdgpu: bypass lru touch for KIQ ring submission drm/amdgpu: Potential uninitialized variable in amdgpu_vm_update_directories() drm/amdgpu: potential uninitialized variable in amdgpu_vce_ring_parse_cs() drm/amd/powerplay: initialize a variable before using it drm/amd/powerplay: suppress KASAN out of bounds warning in vega10_populate_all_memory_levels drm/amd/amdgpu: fix evicted VRAM bo adjudgement condition drm/vblank: Tune drm_crtc_accurate_vblank_count() WARN down to a debug drm/rockchip: add CONFIG_OF dependency for lvds ...
103 lines
2.8 KiB
C
103 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NOUVEAU_FENCE_H__
|
|
#define __NOUVEAU_FENCE_H__
|
|
|
|
#include <linux/dma-fence.h>
|
|
#include <nvif/notify.h>
|
|
|
|
struct nouveau_drm;
|
|
struct nouveau_bo;
|
|
|
|
struct nouveau_fence {
|
|
struct dma_fence base;
|
|
|
|
struct list_head head;
|
|
|
|
struct nouveau_channel __rcu *channel;
|
|
unsigned long timeout;
|
|
};
|
|
|
|
int nouveau_fence_new(struct nouveau_channel *, bool sysmem,
|
|
struct nouveau_fence **);
|
|
void nouveau_fence_unref(struct nouveau_fence **);
|
|
|
|
int nouveau_fence_emit(struct nouveau_fence *, struct nouveau_channel *);
|
|
bool nouveau_fence_done(struct nouveau_fence *);
|
|
int nouveau_fence_wait(struct nouveau_fence *, bool lazy, bool intr);
|
|
int nouveau_fence_sync(struct nouveau_bo *, struct nouveau_channel *, bool exclusive, bool intr);
|
|
|
|
struct nouveau_fence_chan {
|
|
spinlock_t lock;
|
|
struct kref fence_ref;
|
|
|
|
struct list_head pending;
|
|
struct list_head flip;
|
|
|
|
int (*emit)(struct nouveau_fence *);
|
|
int (*sync)(struct nouveau_fence *, struct nouveau_channel *,
|
|
struct nouveau_channel *);
|
|
u32 (*read)(struct nouveau_channel *);
|
|
int (*emit32)(struct nouveau_channel *, u64, u32);
|
|
int (*sync32)(struct nouveau_channel *, u64, u32);
|
|
|
|
u32 sequence;
|
|
u32 context;
|
|
char name[32];
|
|
|
|
struct nvif_notify notify;
|
|
int notify_ref, dead;
|
|
};
|
|
|
|
struct nouveau_fence_priv {
|
|
void (*dtor)(struct nouveau_drm *);
|
|
bool (*suspend)(struct nouveau_drm *);
|
|
void (*resume)(struct nouveau_drm *);
|
|
int (*context_new)(struct nouveau_channel *);
|
|
void (*context_del)(struct nouveau_channel *);
|
|
|
|
u32 contexts;
|
|
u64 context_base;
|
|
bool uevent;
|
|
};
|
|
|
|
#define nouveau_fence(drm) ((struct nouveau_fence_priv *)(drm)->fence)
|
|
|
|
void nouveau_fence_context_new(struct nouveau_channel *, struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_del(struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_free(struct nouveau_fence_chan *);
|
|
|
|
int nv04_fence_create(struct nouveau_drm *);
|
|
int nv04_fence_mthd(struct nouveau_channel *, u32, u32, u32);
|
|
|
|
int nv10_fence_emit(struct nouveau_fence *);
|
|
int nv17_fence_sync(struct nouveau_fence *, struct nouveau_channel *,
|
|
struct nouveau_channel *);
|
|
u32 nv10_fence_read(struct nouveau_channel *);
|
|
void nv10_fence_context_del(struct nouveau_channel *);
|
|
void nv10_fence_destroy(struct nouveau_drm *);
|
|
int nv10_fence_create(struct nouveau_drm *);
|
|
|
|
int nv17_fence_create(struct nouveau_drm *);
|
|
void nv17_fence_resume(struct nouveau_drm *drm);
|
|
|
|
int nv50_fence_create(struct nouveau_drm *);
|
|
int nv84_fence_create(struct nouveau_drm *);
|
|
int nvc0_fence_create(struct nouveau_drm *);
|
|
|
|
int nouveau_flip_complete(struct nvif_notify *);
|
|
|
|
struct nv84_fence_chan {
|
|
struct nouveau_fence_chan base;
|
|
struct nouveau_vma *vma;
|
|
};
|
|
|
|
struct nv84_fence_priv {
|
|
struct nouveau_fence_priv base;
|
|
struct nouveau_bo *bo;
|
|
u32 *suspend;
|
|
struct mutex mutex;
|
|
};
|
|
|
|
int nv84_fence_context_new(struct nouveau_channel *);
|
|
|
|
#endif
|