* [PATCH -next] gpu: i915: fix build errors when ACPI is not enabled
@ 2016-06-25 17:58 Randy Dunlap
2016-06-27 11:53 ` [PATCH] drm/i915: " Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2016-06-25 17:58 UTC (permalink / raw)
To: LKML, linux-next@vger.kernel.org
Cc: Daniel Vetter, Jani Nikula, intel-gfx, dri-devel
From: Randy Dunlap <rdunlap@infradead.org>
Fix build errors when ACPI is not enabled by adding function stubs:
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
intel_opregion_unregister(dev_priv);
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
intel_opregion_register(dev_priv);
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/i915/i915_drv.h | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20160624.orig/drivers/gpu/drm/i915/i915_drv.h
+++ linux-next-20160624/drivers/gpu/drm/i915/i915_drv.h
@@ -3694,6 +3694,8 @@ extern int intel_opregion_notify_adapter
extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
#else
static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
+static inline void intel_opregion_register(struct drm_i915_private *dev_priv) { }
+static inline void intel_opregion_unregister(struct drm_i915_private *dev_priv) { }
static inline void intel_opregion_init(struct drm_i915_private *dev) { }
static inline void intel_opregion_fini(struct drm_i915_private *dev) { }
static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] drm/i915: fix build errors when ACPI is not enabled
2016-06-25 17:58 [PATCH -next] gpu: i915: fix build errors when ACPI is not enabled Randy Dunlap
@ 2016-06-27 11:53 ` Jani Nikula
2016-06-28 8:06 ` Chris Wilson
0 siblings, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2016-06-27 11:53 UTC (permalink / raw)
To: Randy Dunlap, LKML, linux-next@vger.kernel.org
Cc: Daniel Vetter, Jani Nikula, intel-gfx, dri-devel, Jani Nikula,
drm-intel-fixes, Chris Wilson
From: Randy Dunlap <rdunlap@infradead.org>
Fix build errors when ACPI is not enabled by adding function stubs:
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
intel_opregion_unregister(dev_priv);
../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
intel_opregion_register(dev_priv);
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
Cc: drm-intel-fixes@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
[Jani: dropped the stale init/fini declarations]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9ef491975812..724d34b00196 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3694,8 +3694,8 @@ extern int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
extern int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
#else
static inline int intel_opregion_setup(struct drm_i915_private *dev) { return 0; }
-static inline void intel_opregion_init(struct drm_i915_private *dev) { }
-static inline void intel_opregion_fini(struct drm_i915_private *dev) { }
+static inline void intel_opregion_register(struct drm_i915_private *dev_priv) { }
+static inline void intel_opregion_unregister(struct drm_i915_private *dev_priv) { }
static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
{
}
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: fix build errors when ACPI is not enabled
2016-06-27 11:53 ` [PATCH] drm/i915: " Jani Nikula
@ 2016-06-28 8:06 ` Chris Wilson
2016-06-28 11:07 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2016-06-28 8:06 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, Randy Dunlap, LKML, linux-next@vger.kernel.org,
drm-intel-fixes, dri-devel, Daniel Vetter
On Mon, Jun 27, 2016 at 02:53:19PM +0300, Jani Nikula wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix build errors when ACPI is not enabled by adding function stubs:
>
> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
> ../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
> intel_opregion_unregister(dev_priv);
> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
> ../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
> intel_opregion_register(dev_priv);
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
> Cc: drm-intel-fixes@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> [Jani: dropped the stale init/fini declarations]
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: fix build errors when ACPI is not enabled
2016-06-28 8:06 ` Chris Wilson
@ 2016-06-28 11:07 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2016-06-28 11:07 UTC (permalink / raw)
To: Chris Wilson
Cc: Randy Dunlap, LKML, linux-next@vger.kernel.org, Daniel Vetter,
intel-gfx, dri-devel, drm-intel-fixes
On Tue, 28 Jun 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Mon, Jun 27, 2016 at 02:53:19PM +0300, Jani Nikula wrote:
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build errors when ACPI is not enabled by adding function stubs:
>>
>> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
>> ../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
>> intel_opregion_unregister(dev_priv);
>> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
>> ../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
>> intel_opregion_register(dev_priv);
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Daniel Vetter <daniel.vetter@intel.com>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> Cc: intel-gfx@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org
>> Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
>> Cc: drm-intel-fixes@lists.freedesktop.org
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> [Jani: dropped the stale init/fini declarations]
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
Pushed to drm-intel-next-queued, thanks for the patch and review.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-28 11:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-25 17:58 [PATCH -next] gpu: i915: fix build errors when ACPI is not enabled Randy Dunlap
2016-06-27 11:53 ` [PATCH] drm/i915: " Jani Nikula
2016-06-28 8:06 ` Chris Wilson
2016-06-28 11:07 ` Jani Nikula
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).