public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
	Julia Lawall <julia.lawall@lip6.fr>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [Intel-gfx] [PATCH] drm: Print device information again in debugfs
Date: Fri, 14 Oct 2016 13:12:39 +0300	[thread overview]
Message-ID: <87bmynw86g.fsf@intel.com> (raw)
In-Reply-To: <20161013141344.10012-1-daniel.vetter@ffwll.ch>

On Thu, 13 Oct 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> 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: <stable@vger.kernel.org> # v4.8+

> 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>
> ---
>  drivers/gpu/drm/drm_info.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 1df2d33d0b40..ffb2ab389d1d 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -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;

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

      parent reply	other threads:[~2016-10-14 10:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-13 14:13 [PATCH] drm: Print device information again in debugfs Daniel Vetter
2016-10-13 14:29 ` Alex Deucher
2016-10-13 15:02 ` Chris Wilson
2016-10-13 16:50 ` ✗ Fi.CI.BAT: warning for " Patchwork
2016-10-13 17:33 ` [PATCH] " Emil Velikov
2016-10-14 10:12 ` Jani Nikula [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87bmynw86g.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=julia.lawall@lip6.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox