mirror of
https://github.com/torvalds/linux.git
synced 2026-04-22 00:33:58 -04:00
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
...
89 lines
2.1 KiB
C
89 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __GK104_FIFO_H__
|
|
#define __GK104_FIFO_H__
|
|
#define gk104_fifo(p) container_of((p), struct gk104_fifo, base)
|
|
#include "priv.h"
|
|
|
|
#include <core/enum.h>
|
|
#include <subdev/mmu.h>
|
|
|
|
struct gk104_fifo_chan;
|
|
struct gk104_fifo {
|
|
const struct gk104_fifo_func *func;
|
|
struct nvkm_fifo base;
|
|
|
|
struct {
|
|
struct work_struct work;
|
|
u32 engm;
|
|
u32 runm;
|
|
} recover;
|
|
|
|
int pbdma_nr;
|
|
|
|
struct {
|
|
struct nvkm_engine *engine;
|
|
int runl;
|
|
int pbid;
|
|
} engine[16];
|
|
int engine_nr;
|
|
|
|
struct {
|
|
struct nvkm_memory *mem[2];
|
|
int next;
|
|
wait_queue_head_t wait;
|
|
struct list_head chan;
|
|
u32 engm;
|
|
} runlist[16];
|
|
int runlist_nr;
|
|
|
|
struct {
|
|
struct nvkm_memory *mem;
|
|
struct nvkm_vma *bar;
|
|
} user;
|
|
};
|
|
|
|
struct gk104_fifo_func {
|
|
struct {
|
|
const struct nvkm_enum *engine;
|
|
const struct nvkm_enum *reason;
|
|
const struct nvkm_enum *hubclient;
|
|
const struct nvkm_enum *gpcclient;
|
|
} fault;
|
|
|
|
const struct nvkm_fifo_chan_oclass *chan[];
|
|
};
|
|
|
|
int gk104_fifo_new_(const struct gk104_fifo_func *, struct nvkm_device *,
|
|
int index, int nr, struct nvkm_fifo **);
|
|
void gk104_fifo_runlist_insert(struct gk104_fifo *, struct gk104_fifo_chan *);
|
|
void gk104_fifo_runlist_remove(struct gk104_fifo *, struct gk104_fifo_chan *);
|
|
void gk104_fifo_runlist_commit(struct gk104_fifo *, int runl);
|
|
|
|
static inline u64
|
|
gk104_fifo_engine_subdev(int engine)
|
|
{
|
|
switch (engine) {
|
|
case 0: return (1ULL << NVKM_ENGINE_GR) |
|
|
(1ULL << NVKM_ENGINE_SW) |
|
|
(1ULL << NVKM_ENGINE_CE2);
|
|
case 1: return (1ULL << NVKM_ENGINE_MSPDEC);
|
|
case 2: return (1ULL << NVKM_ENGINE_MSPPP);
|
|
case 3: return (1ULL << NVKM_ENGINE_MSVLD);
|
|
case 4: return (1ULL << NVKM_ENGINE_CE0);
|
|
case 5: return (1ULL << NVKM_ENGINE_CE1);
|
|
case 6: return (1ULL << NVKM_ENGINE_MSENC);
|
|
default:
|
|
WARN_ON(1);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
extern const struct nvkm_enum gk104_fifo_fault_engine[];
|
|
extern const struct nvkm_enum gk104_fifo_fault_reason[];
|
|
extern const struct nvkm_enum gk104_fifo_fault_hubclient[];
|
|
extern const struct nvkm_enum gk104_fifo_fault_gpcclient[];
|
|
|
|
extern const struct nvkm_enum gm107_fifo_fault_engine[];
|
|
extern const struct nvkm_enum gp100_fifo_fault_engine[];
|
|
#endif
|