Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa860a17 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Print device information again in debugfs 



I was a bit over-eager in my cleanup in

commit 95c081c1
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: 95c081c1 ("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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Tested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bc91657e

drivers/gpu/drm/drm_info.c

+0 −4
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ int drm_name_info(struct seq_file *m, void *data) 


	mutex_lock(&dev->master_mutex);

	master = dev->master;

	if (!master)

		goto out_unlock;



	seq_printf(m, "%s", dev->driver->name);

	if (dev->dev)

		seq_printf(m, " dev=%s", dev_name(dev->dev));
@@ -65,7 +62,6 @@ int drm_name_info(struct seq_file *m, void *data) 
	if (dev->unique)

		seq_printf(m, " unique=%s", dev->unique);

	seq_printf(m, "\n");

out_unlock:

	mutex_unlock(&dev->master_mutex);



	return 0;