Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d56d63d7 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915/huc: Move HuC declarations into dedicated header 



We want to keep each uC specific code in separate files.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171004153327.32608-6-michal.wajdeczko@intel.com
parent a16b4313

drivers/gpu/drm/i915/intel_huc.h

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

 * Copyright © 2014-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_HUC_H_

#define _INTEL_HUC_H_



struct intel_huc {

	/* Generic uC firmware management */

	struct intel_uc_fw fw;



	/* HuC-specific additions */

};



void intel_huc_select_fw(struct intel_huc *huc);

void intel_huc_init_hw(struct intel_huc *huc);

void intel_huc_auth(struct intel_huc *huc);



#endif

drivers/gpu/drm/i915/intel_uc.h

+1 −12
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "intel_ringbuffer.h"

#include "intel_guc_ct.h"

#include "i915_vma.h"

#include "intel_huc.h"



/*

 * This structure primarily describes the GEM object shared with the GuC.
@@ -127,13 +128,6 @@ struct intel_guc { 
	void (*notify)(struct intel_guc *guc);

};



struct intel_huc {

	/* Generic uC firmware management */

	struct intel_uc_fw fw;



	/* HuC-specific additions */

};



/* intel_uc.c */

void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);

void intel_uc_init_early(struct drm_i915_private *dev_priv);
@@ -186,9 +180,4 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) 
	return offset;

}



/* intel_huc.c */

void intel_huc_select_fw(struct intel_huc *huc);

void intel_huc_init_hw(struct intel_huc *huc);

void intel_huc_auth(struct intel_huc *huc);



#endif