diff options
author | Dave Airlie | 2018-05-15 11:25:07 +0200 |
---|---|---|
committer | Dave Airlie | 2018-05-15 11:25:07 +0200 |
commit | 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4 (patch) | |
tree | d2d5b989da8bc75e2cec4c76a6acb2ab25008539 /drivers/gpu/drm/msm | |
parent | Merge tag 'drm-amdkfd-next-2018-05-14' of git://people.freedesktop.org/~gabba... (diff) | |
parent | gpu: drm: qxl: Adding new typedef vm_fault_t (diff) | |
download | kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.gz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.xz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.zip |
Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v4.18:
UAPI Changes:
- Fix render node number regression from control node removal.
Driver Changes:
- Small header fix for virgl, used by qemu.
- Use vm_fault_t in qxl.
Signed-off-by: Dave Airlie <airlied@redhat.com>
# gpg: Signature made Tue 15 May 2018 06:16:03 PM AEST
# gpg: using RSA key FE558C72A67013C3
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/e63306b9-67a0-74ab-8883-08b3d9db72d2@mblankhorst.nl
Diffstat (limited to 'drivers/gpu/drm/msm')
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_device.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_debugfs.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 8e0cb161754b..0ae5ace65462 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -168,7 +168,6 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) if (gpu->funcs->debugfs_init) { gpu->funcs->debugfs_init(gpu, dev->primary); gpu->funcs->debugfs_init(gpu, dev->render); - gpu->funcs->debugfs_init(gpu, dev->control); } #endif diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index ba74cb4f94df..1ff3fda245d1 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -140,9 +140,6 @@ int msm_debugfs_late_init(struct drm_device *dev) if (ret) return ret; ret = late_init_minor(dev->render); - if (ret) - return ret; - ret = late_init_minor(dev->control); return ret; } |