Commit 3846a9b1 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Move opregion definitions to dedicated intel_opregion.h 



We already have dedicated file for opregion related code, dedicated
header will make our life easier.

v2: reorder includes (Chris)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171221185334.17396-4-michal.wajdeczko@intel.com


[ickle: quieten checkpatch]
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171221215735.30314-3-chris@chris-wilson.co.uk
parent 09a28bd9

drivers/gpu/drm/i915/i915_drv.h

+4 −59
Original line number Diff line number Diff line
@@ -56,13 +56,14 @@ 
#include "i915_reg.h"

#include "i915_utils.h"



#include "intel_uncore.h"

#include "intel_bios.h"

#include "intel_display.h"

#include "intel_dpll_mgr.h"

#include "intel_uc.h"

#include "intel_lrc.h"

#include "intel_opregion.h"

#include "intel_ringbuffer.h"

#include "intel_display.h"

#include "intel_uncore.h"

#include "intel_uc.h"



#include "i915_gem.h"

#include "i915_gem_context.h"
@@ -355,27 +356,6 @@ struct drm_i915_file_private { 
#define DRIVER_MINOR		6

#define DRIVER_PATCHLEVEL	0



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;

};

#define OPREGION_SIZE            (8*1024)



struct intel_overlay;

struct intel_overlay_error_state;
@@ -3816,41 +3796,6 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv, 
bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,

				enum port port);





/* intel_opregion.c */

#ifdef CONFIG_ACPI

extern int intel_opregion_setup(struct drm_i915_private *dev_priv);

extern void intel_opregion_register(struct drm_i915_private *dev_priv);

extern void intel_opregion_unregister(struct drm_i915_private *dev_priv);

extern void intel_opregion_asle_intr(struct drm_i915_private *dev_priv);

extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,

					 bool enable);

extern int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,

					 pci_power_t state);

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_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



/* intel_acpi.c */

#ifdef CONFIG_ACPI

extern void intel_register_dsm_handler(void);

drivers/gpu/drm/i915/intel_opregion.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


#include <drm/drmP.h>

#include <drm/i915_drm.h>



#include "intel_opregion.h"

#include "i915_drv.h"

#include "intel_drv.h"

drivers/gpu/drm/i915/intel_opregion.h

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/*

 * 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;

};



#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_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_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

CRA Git | Maintained and supported by SUSTech CRA and CCSE