From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: fix build for DEBUG_FS=n
Date: Fri, 10 Apr 2015 16:19:49 +0200 [thread overview]
Message-ID: <20150410141949.GM6092@phenom.ffwll.local> (raw)
In-Reply-To: <1428674372-2720-1-git-send-email-jani.nikula@intel.com>
On Fri, Apr 10, 2015 at 04:59:32PM +0300, Jani Nikula wrote:
> Fix DEBUG_FS=n build broken by
>
> commit aa7471d228eb6dfddd0d201ea9746d6a2020972a
> Author: Jani Nikula <jani.nikula@intel.com>
> Date: Wed Apr 1 11:15:21 2015 +0300
>
> drm/i915: add i915 specific connector debugfs file for DPCD
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 822f2591e3c5..8cbb20cd63e6 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3029,10 +3029,11 @@ int i915_verify_lists(struct drm_device *dev);
> /* i915_debugfs.c */
> int i915_debugfs_init(struct drm_minor *minor);
> void i915_debugfs_cleanup(struct drm_minor *minor);
> -int i915_debugfs_connector_add(struct drm_connector *connector);
> #ifdef CONFIG_DEBUG_FS
> +int i915_debugfs_connector_add(struct drm_connector *connector);
> void intel_display_crc_init(struct drm_device *dev);
> #else
> +static inline int i915_debugfs_connector_add(struct drm_connector *connector) {}
> static inline void intel_display_crc_init(struct drm_device *dev) {}
> #endif
>
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-04-10 14:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-10 13:59 [PATCH] drm/i915: fix build for DEBUG_FS=n Jani Nikula
2015-04-10 14:19 ` Daniel Vetter [this message]
2015-04-10 18:32 ` shuang.he
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=20150410141949.GM6092@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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