From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Lv Zheng <zetalog@gmail.com>,
linux-acpi@vger.kernel.org, Lv Zheng <lv.zheng@intel.com>
Subject: Re: [PATCH 1/3] ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
Date: Thu, 05 Dec 2013 15:04:16 +0200 [thread overview]
Message-ID: <87haanqwj3.fsf@intel.com> (raw)
In-Reply-To: <58025298b10c01a76adeed0f27e12d4b764ad99c.1386116927.git.lv.zheng@intel.com>
On Wed, 04 Dec 2013, Lv Zheng <lv.zheng@intel.com> wrote:
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 41838ea..d4ae48b 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
> intel_ringbuffer.o \
> intel_overlay.o \
> intel_sprite.o \
> - intel_opregion.o \
> intel_sideband.o \
> intel_uncore.o \
> dvo_ch7xxx.o \
> @@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
>
> i915-$(CONFIG_COMPAT) += i915_ioc32.o
>
> -i915-$(CONFIG_ACPI) += intel_acpi.o
> +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
>
> i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ccdbecc..7f37b83 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);
>
> /* intel_opregion.c */
> struct intel_encoder;
> -extern int intel_opregion_setup(struct drm_device *dev);
> #ifdef CONFIG_ACPI
> +extern int intel_opregion_setup(struct drm_device *dev);
> extern void intel_opregion_init(struct drm_device *dev);
> extern void intel_opregion_fini(struct drm_device *dev);
> extern void intel_opregion_asle_intr(struct drm_device *dev);
> @@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
> extern int intel_opregion_notify_adapter(struct drm_device *dev,
> pci_power_t state);
> #else
> +static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
> static inline void intel_opregion_init(struct drm_device *dev) { return; }
> static inline void intel_opregion_fini(struct drm_device *dev) { return; }
> static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
FWIW, the above i915 specific hunks are
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Nuking the CONFIG_ACPI conditional build within intel_opregion.c is an
obvious follow-up patch later on.
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2013-12-05 13:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1385094640.git.lv.zheng@intel.com>
[not found] ` <cover.1386116927.git.lv.zheng@intel.com>
2013-12-04 0:38 ` [PATCH 1/3] ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module Lv Zheng
2013-12-04 8:16 ` [Intel-gfx] " Daniel Vetter
2013-12-05 13:04 ` Jani Nikula [this message]
2013-12-05 14:25 ` [PATCH v2] " Lv Zheng
[not found] ` <cover.1386316208.git.lv.zheng@intel.com>
2013-12-06 8:52 ` [PATCH v3 4/6] " Lv Zheng
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=87haanqwj3.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=mjg59@srcf.ucam.org \
--cc=rafael.j.wysocki@intel.com \
--cc=zetalog@gmail.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