From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Thu, 20 Sep 2012 12:21:10 +0000 Subject: Re: [PATCH] drm/i915: Fix !CONFIG_PM sysfs for real this time Message-Id: <20120920122110.GB11179@bremse> List-Id: References: <20120918234054.GA7140@localhost> <1348077019-5893-1-git-send-email-ben@bwidawsk.net> In-Reply-To: <1348077019-5893-1-git-send-email-ben@bwidawsk.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org 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 > Signed-off-by: Ben Widawsky 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Fix !CONFIG_PM sysfs for real this time Date: Thu, 20 Sep 2012 14:21:10 +0200 Message-ID: <20120920122110.GB11179@bremse> References: <20120918234054.GA7140@localhost> <1348077019-5893-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 2931F9F5DA for ; Thu, 20 Sep 2012 05:21:15 -0700 (PDT) Received: by mail-qc0-f177.google.com with SMTP id u28so1756662qcs.36 for ; Thu, 20 Sep 2012 05:21:15 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1348077019-5893-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org 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 > Signed-off-by: Ben Widawsky 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