mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 12:32:31 -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
...
172 lines
5.4 KiB
C
172 lines
5.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NVKM_DISP_IOR_H__
|
|
#define __NVKM_DISP_IOR_H__
|
|
#include "priv.h"
|
|
struct nvkm_i2c_aux;
|
|
|
|
struct nvkm_ior {
|
|
const struct nvkm_ior_func *func;
|
|
struct nvkm_disp *disp;
|
|
enum nvkm_ior_type {
|
|
DAC,
|
|
SOR,
|
|
PIOR,
|
|
} type;
|
|
int id;
|
|
char name[8];
|
|
|
|
struct list_head head;
|
|
|
|
struct nvkm_ior_state {
|
|
struct nvkm_outp *outp;
|
|
unsigned rgdiv;
|
|
unsigned proto_evo:4;
|
|
enum nvkm_ior_proto {
|
|
CRT,
|
|
TV,
|
|
TMDS,
|
|
LVDS,
|
|
DP,
|
|
UNKNOWN
|
|
} proto:3;
|
|
unsigned link:2;
|
|
unsigned head:4;
|
|
} arm, asy;
|
|
|
|
/* Armed DP state. */
|
|
struct {
|
|
bool mst;
|
|
bool ef;
|
|
u8 nr;
|
|
u8 bw;
|
|
} dp;
|
|
};
|
|
|
|
struct nvkm_ior_func {
|
|
struct {
|
|
int (*get)(struct nvkm_outp *, int *link);
|
|
void (*set)(struct nvkm_outp *, struct nvkm_ior *);
|
|
} route;
|
|
|
|
void (*state)(struct nvkm_ior *, struct nvkm_ior_state *);
|
|
void (*power)(struct nvkm_ior *, bool normal, bool pu,
|
|
bool data, bool vsync, bool hsync);
|
|
int (*sense)(struct nvkm_ior *, u32 loadval);
|
|
void (*clock)(struct nvkm_ior *);
|
|
void (*war_2)(struct nvkm_ior *);
|
|
void (*war_3)(struct nvkm_ior *);
|
|
|
|
struct {
|
|
void (*ctrl)(struct nvkm_ior *, int head, bool enable,
|
|
u8 max_ac_packet, u8 rekey, u8 *avi, u8 avi_size,
|
|
u8 *vendor, u8 vendor_size);
|
|
} hdmi;
|
|
|
|
struct {
|
|
u8 lanes[4];
|
|
int (*links)(struct nvkm_ior *, struct nvkm_i2c_aux *);
|
|
void (*power)(struct nvkm_ior *, int nr);
|
|
void (*pattern)(struct nvkm_ior *, int pattern);
|
|
void (*drive)(struct nvkm_ior *, int ln, int pc,
|
|
int dc, int pe, int tx_pu);
|
|
void (*vcpi)(struct nvkm_ior *, int head, u8 slot,
|
|
u8 slot_nr, u16 pbn, u16 aligned);
|
|
void (*audio)(struct nvkm_ior *, int head, bool enable);
|
|
void (*audio_sym)(struct nvkm_ior *, int head, u16 h, u32 v);
|
|
void (*activesym)(struct nvkm_ior *, int head,
|
|
u8 TU, u8 VTUa, u8 VTUf, u8 VTUi);
|
|
void (*watermark)(struct nvkm_ior *, int head, u8 watermark);
|
|
} dp;
|
|
|
|
struct {
|
|
void (*hpd)(struct nvkm_ior *, int head, bool present);
|
|
void (*eld)(struct nvkm_ior *, u8 *data, u8 size);
|
|
} hda;
|
|
};
|
|
|
|
int nvkm_ior_new_(const struct nvkm_ior_func *func, struct nvkm_disp *,
|
|
enum nvkm_ior_type type, int id);
|
|
void nvkm_ior_del(struct nvkm_ior **);
|
|
struct nvkm_ior *nvkm_ior_find(struct nvkm_disp *, enum nvkm_ior_type, int id);
|
|
|
|
static inline u32
|
|
nv50_ior_base(struct nvkm_ior *ior)
|
|
{
|
|
return ior->id * 0x800;
|
|
}
|
|
|
|
void nv50_dac_power(struct nvkm_ior *, bool, bool, bool, bool, bool);
|
|
int nv50_dac_sense(struct nvkm_ior *, u32);
|
|
|
|
void nv50_pior_depth(struct nvkm_ior *, struct nvkm_ior_state *, u32 ctrl);
|
|
|
|
static inline u32
|
|
nv50_sor_link(struct nvkm_ior *ior)
|
|
{
|
|
return nv50_ior_base(ior) + ((ior->asy.link == 2) * 0x80);
|
|
}
|
|
|
|
int nv50_sor_new_(const struct nvkm_ior_func *, struct nvkm_disp *, int id);
|
|
void nv50_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);
|
|
void nv50_sor_power(struct nvkm_ior *, bool, bool, bool, bool, bool);
|
|
void nv50_sor_clock(struct nvkm_ior *);
|
|
|
|
void g94_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);
|
|
int g94_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *);
|
|
void g94_sor_dp_power(struct nvkm_ior *, int);
|
|
void g94_sor_dp_pattern(struct nvkm_ior *, int);
|
|
void g94_sor_dp_drive(struct nvkm_ior *, int, int, int, int, int);
|
|
void g94_sor_dp_audio_sym(struct nvkm_ior *, int, u16, u32);
|
|
void g94_sor_dp_activesym(struct nvkm_ior *, int, u8, u8, u8, u8);
|
|
void g94_sor_dp_watermark(struct nvkm_ior *, int, u8);
|
|
|
|
void gt215_sor_dp_audio(struct nvkm_ior *, int, bool);
|
|
|
|
int gf119_sor_new_(const struct nvkm_ior_func *, struct nvkm_disp *, int id);
|
|
void gf119_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);
|
|
void gf119_sor_clock(struct nvkm_ior *);
|
|
int gf119_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *);
|
|
void gf119_sor_dp_pattern(struct nvkm_ior *, int);
|
|
void gf119_sor_dp_drive(struct nvkm_ior *, int, int, int, int, int);
|
|
void gf119_sor_dp_vcpi(struct nvkm_ior *, int, u8, u8, u16, u16);
|
|
void gf119_sor_dp_audio(struct nvkm_ior *, int, bool);
|
|
void gf119_sor_dp_audio_sym(struct nvkm_ior *, int, u16, u32);
|
|
void gf119_sor_dp_watermark(struct nvkm_ior *, int, u8);
|
|
|
|
void gm107_sor_dp_pattern(struct nvkm_ior *, int);
|
|
|
|
void g84_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
|
|
void gt215_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
|
|
void gf119_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
|
|
void gk104_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
|
|
|
|
void gt215_hda_hpd(struct nvkm_ior *, int, bool);
|
|
void gt215_hda_eld(struct nvkm_ior *, u8 *, u8);
|
|
|
|
void gf119_hda_hpd(struct nvkm_ior *, int, bool);
|
|
void gf119_hda_eld(struct nvkm_ior *, u8 *, u8);
|
|
|
|
#define IOR_MSG(i,l,f,a...) do { \
|
|
struct nvkm_ior *_ior = (i); \
|
|
nvkm_##l(&_ior->disp->engine.subdev, "%s: "f"\n", _ior->name, ##a); \
|
|
} while(0)
|
|
#define IOR_WARN(i,f,a...) IOR_MSG((i), warn, f, ##a)
|
|
#define IOR_DBG(i,f,a...) IOR_MSG((i), debug, f, ##a)
|
|
|
|
int nv50_dac_new(struct nvkm_disp *, int);
|
|
int gf119_dac_new(struct nvkm_disp *, int);
|
|
|
|
int nv50_pior_new(struct nvkm_disp *, int);
|
|
|
|
int nv50_sor_new(struct nvkm_disp *, int);
|
|
int g84_sor_new(struct nvkm_disp *, int);
|
|
int g94_sor_new(struct nvkm_disp *, int);
|
|
int mcp77_sor_new(struct nvkm_disp *, int);
|
|
int gt215_sor_new(struct nvkm_disp *, int);
|
|
int mcp89_sor_new(struct nvkm_disp *, int);
|
|
int gf119_sor_new(struct nvkm_disp *, int);
|
|
int gk104_sor_new(struct nvkm_disp *, int);
|
|
int gm107_sor_new(struct nvkm_disp *, int);
|
|
int gm200_sor_new(struct nvkm_disp *, int);
|
|
#endif
|