Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Print device information again in debugfs

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue Jun 21 10:54:12 2016 +0200

drm: Move master pointer from drm_minor to drm_device

Noticed by Chris Wilson.

Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Daniel Vetter and committed by
Dave Airlie
fa860a17 bc91657e

-4
-4
drivers/gpu/drm/drm_info.c
··· 54 54 55 55 mutex_lock(&dev->master_mutex); 56 56 master = dev->master; 57 - if (!master) 58 - goto out_unlock; 59 - 60 57 seq_printf(m, "%s", dev->driver->name); 61 58 if (dev->dev) 62 59 seq_printf(m, " dev=%s", dev_name(dev->dev)); ··· 62 65 if (dev->unique) 63 66 seq_printf(m, " unique=%s", dev->unique); 64 67 seq_printf(m, "\n"); 65 - out_unlock: 66 68 mutex_unlock(&dev->master_mutex); 67 69 68 70 return 0;