Merge tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie:
"Highlights:
- Core DRM had a lot of refactoring around managed drm resources to
make drivers simpler.
- Intel Tigerlake support is on by default
- amdgpu now support p2p PCI buffer sharing and encrypted GPU memory
Details:
core:
- uapi: error out EBUSY when existing master
- uapi: rework SET/DROP MASTER permission handling
- remove drm_pci.h
- drm_pci* are now legacy
- introduced managed DRM resources
- subclassing support for drm_framebuffer
- simple encoder helper
- edid improvements
- vblank + writeback documentation improved
- drm/mm - optimise tree searches
- port drivers to use devm_drm_dev_alloc
dma-buf:
- add flag for p2p buffer support
mst:
- ACT timeout improvements
- remove drm_dp_mst_has_audio
- don't use 2nd TX slot - spec recommends against it
bridge:
- dw-hdmi various improvements
- chrontel ch7033 support
- fix stack issues with old gcc
hdmi:
- add unpack function for drm infoframe
fbdev:
- misc fbdev driver fixes
i915:
- uapi: global sseu pinning
- uapi: OA buffer polling
- uapi: remove generated perf code
- uapi: per-engine default property values in sysfs
- Tigerlake GEN12 enabled.
- Lots of gem refactoring
- Tigerlake enablement patches
- move to drm_device logging
- Icelake gamma HW readout
- push MST link retrain to hotplug work
- bandwidth atomic helpers
- ICL fixes
- RPS/GT refactoring
- Cherryview full-ppgtt support
- i915 locking guidelines documented
- require linear fb stride to be 512 multiple on gen9
- Tigerlake SAGV support
amdgpu:
- uapi: encrypted GPU memory handling
- uapi: add MEM_SYNC IB flag
- p2p dma-buf support
- export VRAM dma-bufs
- FRU chip access support
- RAS/SR-IOV updates
- Powerplay locking fixes
- VCN DPG (powergating) enablement
- GFX10 clockgating fixes
- DC fixes
- GPU reset fixes
- navi SDMA fix
- expose FP16 for modesetting
- DP 1.4 compliance fixes
- gfx10 soft recovery
- Improved Critical Thermal Faults handling
- resizable BAR on gmc10
amdkfd:
- uapi: GWS resource management
- track GPU memory per process
- report PCI domain in topology
radeon:
- safe reg list generator fixes
nouveau:
- HD audio fixes on recent systems
- vGPU detection (fail probe if we're on one, for now)
- Interlaced mode fixes (mostly avoidance on Turing, which doesn't support it)
- SVM improvements/fixes
- NVIDIA format modifier support
- Misc other fixes.
adv7511:
- HDMI SPDIF support
ast:
- allocate crtc state size
- fix double assignment
- fix suspend
bochs:
- drop connector register
cirrus:
- move to tiny drivers.
exynos:
- fix imported dma-buf mapping
- enable runtime PM
- fixes and cleanups
mediatek:
- DPI pin mode swap
- config mipi_tx current/impedance
lima:
- devfreq + cooling device support
- task handling improvements
- runtime PM support
pl111:
- vexpress init improvements
- fix module auto-load
rcar-du:
- DT bindings conversion to YAML
- Planes zpos sanity check and fix
- MAINTAINERS entry for LVDS panel driver
mcde:
- fix return value
mgag200:
- use managed config init
stm:
- read endpoints from DT
vboxvideo:
- use PCI managed functions
- drop WC mtrr
vkms:
- enable cursor by default
rockchip:
- afbc support
virtio:
- various cleanups
qxl:
- fix cursor notify port
hisilicon:
- 128-byte stride alignment fix
sun4i:
- improved format handling"
* tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm: (1401 commits)
drm/amd/display: Fix potential integer wraparound resulting in a hang
drm/amd/display: drop cursor position check in atomic test
drm/amdgpu: fix device attribute node create failed with multi gpu
drm/nouveau: use correct conflicting framebuffer API
drm/vblank: Fix -Wformat compile warnings on some arches
drm/amdgpu: Sync with VM root BO when switching VM to CPU update mode
drm/amd/display: Handle GPU reset for DC block
drm/amdgpu: add apu flags (v2)
drm/amd/powerpay: Disable gfxoff when setting manual mode on picasso and raven
drm/amdgpu: fix pm sysfs node handling (v2)
drm/amdgpu: move gpu_info parsing after common early init
drm/amdgpu: move discovery gfx config fetching
drm/nouveau/dispnv50: fix runtime pm imbalance on error
drm/nouveau: fix runtime pm imbalance on error
drm/nouveau: fix runtime pm imbalance on error
drm/nouveau/debugfs: fix runtime pm imbalance on error
drm/nouveau/nouveau/hmm: fix migrate zero page to GPU
drm/nouveau/nouveau/hmm: fix nouveau_dmem_chunk allocations
drm/nouveau/kms/nv50-: Share DP SST mode_valid() handling with MST
drm/nouveau/kms/nv50-: Move 8BPC limit for MST into nv50_mstc_get_modes()
...
This commit is contained in:
Linus Torvalds
@@ -148,27 +148,19 @@ reset_set(void *data, u64 val)
|
||||
DEFINE_SIMPLE_ATTRIBUTE(reset_fops, NULL, reset_set, "%llx\n");
|
||||
|
||||
|
||||
int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)
|
||||
void a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)
|
||||
{
|
||||
struct drm_device *dev;
|
||||
int ret;
|
||||
|
||||
if (!minor)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
dev = minor->dev;
|
||||
|
||||
ret = drm_debugfs_create_files(a5xx_debugfs_list,
|
||||
ARRAY_SIZE(a5xx_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
if (ret) {
|
||||
DRM_DEV_ERROR(dev->dev, "could not install a5xx_debugfs_list\n");
|
||||
return ret;
|
||||
}
|
||||
drm_debugfs_create_files(a5xx_debugfs_list,
|
||||
ARRAY_SIZE(a5xx_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
debugfs_create_file("reset", S_IWUGO, minor->debugfs_root, dev,
|
||||
&reset_fops);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ struct a5xx_gpu {
|
||||
#define to_a5xx_gpu(x) container_of(x, struct a5xx_gpu, base)
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor);
|
||||
void a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -259,17 +259,9 @@ static struct drm_info_list mdp5_debugfs_list[] = {
|
||||
|
||||
static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
|
||||
{
|
||||
struct drm_device *dev = minor->dev;
|
||||
int ret;
|
||||
|
||||
ret = drm_debugfs_create_files(mdp5_debugfs_list,
|
||||
ARRAY_SIZE(mdp5_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
if (ret) {
|
||||
DRM_DEV_ERROR(dev->dev, "could not install mdp5_debugfs_list\n");
|
||||
return ret;
|
||||
}
|
||||
drm_debugfs_create_files(mdp5_debugfs_list,
|
||||
ARRAY_SIZE(mdp5_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -214,31 +214,20 @@ int msm_debugfs_late_init(struct drm_device *dev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int msm_debugfs_init(struct drm_minor *minor)
|
||||
void msm_debugfs_init(struct drm_minor *minor)
|
||||
{
|
||||
struct drm_device *dev = minor->dev;
|
||||
struct msm_drm_private *priv = dev->dev_private;
|
||||
int ret;
|
||||
|
||||
ret = drm_debugfs_create_files(msm_debugfs_list,
|
||||
ARRAY_SIZE(msm_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
if (ret) {
|
||||
DRM_DEV_ERROR(dev->dev, "could not install msm_debugfs_list\n");
|
||||
return ret;
|
||||
}
|
||||
drm_debugfs_create_files(msm_debugfs_list,
|
||||
ARRAY_SIZE(msm_debugfs_list),
|
||||
minor->debugfs_root, minor);
|
||||
|
||||
debugfs_create_file("gpu", S_IRUSR, minor->debugfs_root,
|
||||
dev, &msm_gpu_fops);
|
||||
|
||||
if (priv->kms && priv->kms->funcs->debugfs_init) {
|
||||
ret = priv->kms->funcs->debugfs_init(priv->kms, minor);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
if (priv->kms && priv->kms->funcs->debugfs_init)
|
||||
priv->kms->funcs->debugfs_init(priv->kms, minor);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#define __MSM_DEBUGFS_H__
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
int msm_debugfs_init(struct drm_minor *minor);
|
||||
void msm_debugfs_init(struct drm_minor *minor);
|
||||
#endif
|
||||
|
||||
#endif /* __MSM_DEBUGFS_H__ */
|
||||
|
||||
@@ -57,7 +57,7 @@ struct msm_gpu_funcs {
|
||||
void (*show)(struct msm_gpu *gpu, struct msm_gpu_state *state,
|
||||
struct drm_printer *p);
|
||||
/* for generation specific debugfs: */
|
||||
int (*debugfs_init)(struct msm_gpu *gpu, struct drm_minor *minor);
|
||||
void (*debugfs_init)(struct msm_gpu *gpu, struct drm_minor *minor);
|
||||
#endif
|
||||
unsigned long (*gpu_busy)(struct msm_gpu *gpu);
|
||||
struct msm_gpu_state *(*gpu_state_get)(struct msm_gpu *gpu);
|
||||
|
||||
Reference in New Issue
Block a user