From: Daniel Vetter <daniel@ffwll.ch>
To: Ben Widawsky <ben@bwidawsk.net>
Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fix !CONFIG_PM sysfs for real this time
Date: Thu, 20 Sep 2012 12:21:10 +0000 [thread overview]
Message-ID: <20120920122110.GB11179@bremse> (raw)
In-Reply-To: <1348077019-5893-1-git-send-email-ben@bwidawsk.net>
On Wed, Sep 19, 2012 at 10:50:19AM -0700, Ben Widawsky wrote:
> Somehow this hunk got dropped from my last patch. We do not have the
> rc6_attrs when there is no CONFIG_PM so this causes a compilation error.
>
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_sysfs.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> index 4717a42..5f33a6b 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -413,5 +413,7 @@ void i915_teardown_sysfs(struct drm_device *dev)
> {
> sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs);
> device_remove_bin_file(&dev->primary->kdev, &dpf_attrs);
> +#ifdef CONFIG_PM
> sysfs_unmerge_group(&dev->primary->kdev.kobj, &rc6_attr_group);
> +#endif
> }
> --
> 1.7.12
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
prev parent reply other threads:[~2012-09-20 12:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-18 23:40 [drm-intel:drm-intel-nightly 40/142] drivers/gpu/drm/i915/i915_sysfs.c:228:49: error: 'rc6_attr_grou Fengguang Wu
2012-09-18 23:49 ` [drm-intel:drm-intel-nightly 40/142] drivers/gpu/drm/i915/i915_sysfs.c:228:49: error: 'rc6_attr_ Ben Widawsky
2012-09-19 17:50 ` [PATCH] drm/i915: Fix !CONFIG_PM sysfs for real this time Ben Widawsky
2012-09-20 12:21 ` Daniel Vetter [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=20120920122110.GB11179@bremse \
--to=daniel@ffwll.ch \
--cc=ben@bwidawsk.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kernel-janitors@vger.kernel.org \
/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).