intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Nathan Chancellor <natechancellor@gmail.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: remove duplicate typedef for intel_wakeref_t
Date: Wed, 22 May 2019 12:57:14 -0700	[thread overview]
Message-ID: <20190522195714.GA94676@archlinux-epyc> (raw)
In-Reply-To: <20190522103505.2082-1-jani.nikula@intel.com>

On Wed, May 22, 2019 at 01:35:05PM +0300, Jani Nikula wrote:
> Fix the duplicate typedef for intel_wakeref_t leading to Clang build
> issues. While at it, actually make the intel_runtime_pm.h header
> self-contained, which was claimed in the commit being fixed.
> 
> Reported-by: Nathan Chancellor <natechancellor@gmail.com>
> Cc: Nathan Chancellor <natechancellor@gmail.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> References: http://mid.mail-archive.com/20190521183850.GA9157@archlinux-epyc
> References: https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/201754420#L2435
> Fixes: 0d5adc5f2f01 ("drm/i915: extract intel_runtime_pm.h from intel_drv.h")
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>

> ---
>  drivers/gpu/drm/i915/Makefile.header-test | 1 +
>  drivers/gpu/drm/i915/intel_runtime_pm.h   | 8 +++++---
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> index 2ca4a5f..3a9663 100644
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> @@ -55,6 +55,7 @@ header_test := \
>  	intel_pm.h \
>  	intel_psr.h \
>  	intel_quirks.h \
> +	intel_runtime_pm.h \
>  	intel_sdvo.h \
>  	intel_sideband.h \
>  	intel_sprite.h \
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
> index b964ca..0a4c4b 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.h
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
> @@ -6,12 +6,14 @@
>  #ifndef __INTEL_RUNTIME_PM_H__
>  #define __INTEL_RUNTIME_PM_H__
>  
> -#include <linux/stackdepot.h>
>  #include <linux/types.h>
>  
> -struct drm_i915_private;
> +#include "intel_display.h"
> +#include "intel_wakeref.h"
>  
> -typedef depot_stack_handle_t intel_wakeref_t;
> +struct drm_i915_private;
> +struct drm_printer;
> +struct intel_encoder;
>  
>  enum i915_drm_suspend_mode {
>  	I915_DRM_SUSPEND_IDLE,
> -- 
> 2.20.1
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-05-22 19:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 10:35 [PATCH] drm/i915: remove duplicate typedef for intel_wakeref_t Jani Nikula
2019-05-22 10:41 ` Chris Wilson
2019-05-22 15:35 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-05-22 15:59 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-22 19:57 ` Nathan Chancellor [this message]
2019-05-23 12:49   ` [PATCH] " Jani Nikula
2019-05-23 11:50 ` ✓ Fi.CI.IGT: success for " Patchwork

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=20190522195714.GA94676@archlinux-epyc \
    --to=natechancellor@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).