diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-15 12:25:07 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-15 12:25:07 +0300 |
| commit | 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4 (patch) | |
| tree | d2d5b989da8bc75e2cec4c76a6acb2ab25008539 /drivers/gpu/drm/drm_sysfs.c | |
| parent | c76f0b2cc2f1be1a8a20f0fe2c0f30919bc559fb (diff) | |
| parent | 68266f1c08db731fa7c3a0903bf890fc76ce9345 (diff) | |
| download | linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.xz | |
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/drm_sysfs.c')
| -rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 1c5b5ce1fd7f..b3c1daad1169 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -331,9 +331,7 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor) struct device *kdev; int r; - if (minor->type == DRM_MINOR_CONTROL) - minor_str = "controlD%d"; - else if (minor->type == DRM_MINOR_RENDER) + if (minor->type == DRM_MINOR_RENDER) minor_str = "renderD%d"; else minor_str = "card%d"; |