[Intel-gfx] [PATCH 07/23] drm/i915: Move HAS_GUC_UCODE definition to platform definition

[Rodrigo Vivi]

please kill this _ucode variation that is just a alias to guc instead....

On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa at intel.com> wrote:
> Moving all GPU features to the platform definition allows for
>         - standard place when adding new features from new platforms
>         - possible to see supported featurs when dumping struct
>           definitions
>
> Signed-off-by: Carlos Santa <carlos.santa at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  drivers/gpu/drm/i915/i915_pci.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 09c907f..7186665 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -773,6 +773,7 @@ struct intel_csr {
>         func(has_core_ring_freq) sep \
>         func(has_csr) sep \
>         func(has_guc) sep \
> +       func(has_guc_ucode) sep \
>         func(has_pipe_cxsr) sep \
>         func(has_hotplug) sep \
>         func(cursor_needs_physical) sep \
> @@ -2864,7 +2865,7 @@ struct drm_i915_cmd_table {
>   * properties, so we have separate macros to test them.
>   */
>  #define HAS_GUC(dev)           (INTEL_INFO(dev)->has_guc)
> -#define HAS_GUC_UCODE(dev)     (HAS_GUC(dev))
> +#define HAS_GUC_UCODE(dev)     (INTEL_INFO(dev)->has_guc_ucode)
>  #define HAS_GUC_SCHED(dev)     (HAS_GUC(dev))
>
>  #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index f42bf19..8171915 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -327,7 +327,8 @@ static const struct intel_device_info intel_cherryview_info = {
>  #define GEN9_FEATURES  \
>         .gen = 9, \
>         .has_csr = 1, \
> -       .has_guc = 1
> +       .has_guc = 1, \
> +       .has_guc_ucode = 1
>
>  static const struct intel_device_info intel_skylake_info = {
>         BDW_FEATURES,
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br