[Intel-gfx] [PATCH 06/10] drm/i915/huc: Move HuC specific declarations from intel_uc.h to intel_huc.h

[Kamble, Sagar A]

On 9/18/2017 1:43 AM, Michal Wajdeczko wrote:
> On Sun, 17 Sep 2017 14:17:30 +0200, Sagar Arun Kamble 
> <sagar.a.kamble at intel.com> wrote:
>
> Missing commit message
Sorry. Will update.
>
>> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> Cc: Michał Winiarski <michal.winiarski at intel.com>
>> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_drv.h  |  1 +
>>  drivers/gpu/drm/i915/intel_huc.h | 39 
>> +++++++++++++++++++++++++++++++++++++++
>>  drivers/gpu/drm/i915/intel_uc.h  | 12 ------------
>>  3 files changed, 40 insertions(+), 12 deletions(-)
>>  create mode 100644 drivers/gpu/drm/i915/intel_huc.h
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h 
>> b/drivers/gpu/drm/i915/i915_drv.h
>> index b0f38bb..a3b7435 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -60,6 +60,7 @@
>>  #include "intel_dpll_mgr.h"
>>  #include "intel_uc.h"
>>  #include "intel_guc.h"
>> +#include "intel_huc.h"
>
> Huc/Guc details shall be wrapped into "intel_uc.h"
Yes. Will update.
>
>>  #include "intel_lrc.h"
>>  #include "intel_ringbuffer.h"
>> diff --git a/drivers/gpu/drm/i915/intel_huc.h 
>> b/drivers/gpu/drm/i915/intel_huc.h
>> new file mode 100644
>> index 0000000..4604a40
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/intel_huc.h
>> @@ -0,0 +1,39 @@
>> +/*
>> + * Copyright © 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 */
>> +};
>> +
>> +/* 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
>> diff --git a/drivers/gpu/drm/i915/intel_uc.h 
>> b/drivers/gpu/drm/i915/intel_uc.h
>> index aad0b1c..0d346ef 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.h
>> +++ b/drivers/gpu/drm/i915/intel_uc.h
>> @@ -98,13 +98,6 @@ struct intel_uc_fw {
>>      uint32_t ucode_offset;
>>  };
>> -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);
>> @@ -113,9 +106,4 @@ struct intel_huc {
>>  int intel_uc_init_hw(struct drm_i915_private *dev_priv);
>>  void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
>> -/* 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
>