mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
e60e1ee606
-----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
...
115 lines
3.3 KiB
C
115 lines
3.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NOUVEAU_DISPLAY_H__
|
|
#define __NOUVEAU_DISPLAY_H__
|
|
#include "nouveau_drv.h"
|
|
|
|
struct nouveau_framebuffer {
|
|
struct drm_framebuffer base;
|
|
struct nouveau_bo *nvbo;
|
|
struct nouveau_vma *vma;
|
|
u32 r_handle;
|
|
u32 r_format;
|
|
u32 r_pitch;
|
|
struct nvif_object h_base[4];
|
|
struct nvif_object h_core;
|
|
};
|
|
|
|
static inline struct nouveau_framebuffer *
|
|
nouveau_framebuffer(struct drm_framebuffer *fb)
|
|
{
|
|
return container_of(fb, struct nouveau_framebuffer, base);
|
|
}
|
|
|
|
int nouveau_framebuffer_new(struct drm_device *,
|
|
const struct drm_mode_fb_cmd2 *,
|
|
struct nouveau_bo *, struct nouveau_framebuffer **);
|
|
|
|
struct nouveau_page_flip_state {
|
|
struct list_head head;
|
|
struct drm_pending_vblank_event *event;
|
|
struct drm_crtc *crtc;
|
|
int bpp, pitch;
|
|
u64 offset;
|
|
};
|
|
|
|
struct nouveau_display {
|
|
void *priv;
|
|
void (*dtor)(struct drm_device *);
|
|
int (*init)(struct drm_device *);
|
|
void (*fini)(struct drm_device *);
|
|
|
|
struct nvif_object disp;
|
|
|
|
struct drm_property *dithering_mode;
|
|
struct drm_property *dithering_depth;
|
|
struct drm_property *underscan_property;
|
|
struct drm_property *underscan_hborder_property;
|
|
struct drm_property *underscan_vborder_property;
|
|
/* not really hue and saturation: */
|
|
struct drm_property *vibrant_hue_property;
|
|
struct drm_property *color_vibrance_property;
|
|
|
|
struct drm_atomic_state *suspend;
|
|
};
|
|
|
|
static inline struct nouveau_display *
|
|
nouveau_display(struct drm_device *dev)
|
|
{
|
|
return nouveau_drm(dev)->display;
|
|
}
|
|
|
|
int nouveau_display_create(struct drm_device *dev);
|
|
void nouveau_display_destroy(struct drm_device *dev);
|
|
int nouveau_display_init(struct drm_device *dev);
|
|
void nouveau_display_fini(struct drm_device *dev, bool suspend);
|
|
int nouveau_display_suspend(struct drm_device *dev, bool runtime);
|
|
void nouveau_display_resume(struct drm_device *dev, bool runtime);
|
|
int nouveau_display_vblank_enable(struct drm_device *, unsigned int);
|
|
void nouveau_display_vblank_disable(struct drm_device *, unsigned int);
|
|
bool nouveau_display_scanoutpos(struct drm_device *, unsigned int,
|
|
bool, int *, int *, ktime_t *,
|
|
ktime_t *, const struct drm_display_mode *);
|
|
|
|
int nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
|
|
struct drm_pending_vblank_event *event,
|
|
uint32_t page_flip_flags,
|
|
struct drm_modeset_acquire_ctx *ctx);
|
|
int nouveau_finish_page_flip(struct nouveau_channel *,
|
|
struct nouveau_page_flip_state *);
|
|
|
|
int nouveau_display_dumb_create(struct drm_file *, struct drm_device *,
|
|
struct drm_mode_create_dumb *args);
|
|
int nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *,
|
|
u32 handle, u64 *offset);
|
|
|
|
void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
|
|
|
|
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
|
|
extern int nouveau_backlight_init(struct drm_device *);
|
|
extern void nouveau_backlight_exit(struct drm_device *);
|
|
extern void nouveau_backlight_ctor(void);
|
|
extern void nouveau_backlight_dtor(void);
|
|
#else
|
|
static inline int
|
|
nouveau_backlight_init(struct drm_device *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_exit(struct drm_device *dev) {
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_ctor(void) {
|
|
}
|
|
|
|
static inline void
|
|
nouveau_backlight_dtor(void) {
|
|
}
|
|
#endif
|
|
|
|
struct drm_framebuffer *
|
|
nouveau_user_framebuffer_create(struct drm_device *, struct drm_file *,
|
|
const struct drm_mode_fb_cmd2 *);
|
|
#endif
|