forked from Minki/linux
5a756aadf5
248 "multiple definition of ...". E.g.:
LD [M] drivers/gpu/drm/i915/i915.o
ld: drivers/gpu/drm/i915/i915_irq.o: in function `intel_opregion_resume':
i915_irq.c:(.text+0x58f0): multiple definition of `intel_opregion_resume';
drivers/gpu/drm/i915/i915_drv.o:i915_drv.c:(.text+0x2d40): first defined here
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: a950adc6c3 ("drm/i915: Stop calling intel_opregion unregister/register in suspend/resume")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build tested
Link: https://patchwork.freedesktop.org/patch/msgid/20181129210543.31555-1-chris@chris-wilson.co.uk
123 lines
3.3 KiB
C
123 lines
3.3 KiB
C
/*
|
|
* Copyright © 2008-2017 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifndef _INTEL_OPREGION_H_
|
|
#define _INTEL_OPREGION_H_
|
|
|
|
#include <linux/workqueue.h>
|
|
#include <linux/pci.h>
|
|
|
|
struct drm_i915_private;
|
|
struct intel_encoder;
|
|
|
|
struct opregion_header;
|
|
struct opregion_acpi;
|
|
struct opregion_swsci;
|
|
struct opregion_asle;
|
|
|
|
struct intel_opregion {
|
|
struct opregion_header *header;
|
|
struct opregion_acpi *acpi;
|
|
struct opregion_swsci *swsci;
|
|
u32 swsci_gbda_sub_functions;
|
|
u32 swsci_sbcb_sub_functions;
|
|
struct opregion_asle *asle;
|
|
void *rvda;
|
|
void *vbt_firmware;
|
|
const void *vbt;
|
|
u32 vbt_size;
|
|
u32 *lid_state;
|
|
struct work_struct asle_work;
|
|
struct notifier_block acpi_notifier;
|
|
};
|
|
|
|
#define OPREGION_SIZE (8 * 1024)
|
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
int intel_opregion_setup(struct drm_i915_private *dev_priv);
|
|
|
|
void intel_opregion_register(struct drm_i915_private *dev_priv);
|
|
void intel_opregion_unregister(struct drm_i915_private *dev_priv);
|
|
|
|
void intel_opregion_resume(struct drm_i915_private *dev_priv);
|
|
void intel_opregion_suspend(struct drm_i915_private *dev_priv,
|
|
pci_power_t state);
|
|
|
|
void intel_opregion_asle_intr(struct drm_i915_private *dev_priv);
|
|
int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
|
|
bool enable);
|
|
int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,
|
|
pci_power_t state);
|
|
int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv);
|
|
|
|
#else /* CONFIG_ACPI*/
|
|
|
|
static inline int intel_opregion_setup(struct drm_i915_private *dev_priv)
|
|
{
|
|
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_resume(struct drm_i915_private *dev_priv)
|
|
{
|
|
}
|
|
|
|
static inline void intel_opregion_suspend(struct drm_i915_private *dev_priv,
|
|
pci_power_t state)
|
|
{
|
|
}
|
|
|
|
static inline void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
|
|
{
|
|
}
|
|
|
|
static inline int
|
|
intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, bool enable)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
intel_opregion_notify_adapter(struct drm_i915_private *dev, pci_power_t state)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
#endif /* CONFIG_ACPI */
|
|
|
|
#endif
|