[Intel-gfx] [PATCH 12/23] drm/i915: Move HAS_DP_MST definition to platform definition

Rodrigo Vivi rodrigo.vivi at gmail.com
Wed Jul 20 21:21:09 UTC 2016


On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa at intel.com> wrote:
> Moving all GPU features to the platform struct definition allows for
>         - standard place when adding new features from new platforms
>         - possible to see supported features when dumping struct
>           definitions
>
> Signed-off-by: Carlos Santa <carlos.santa at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 5 ++---
>  drivers/gpu/drm/i915/i915_pci.c | 4 +++-
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index a6a22b4..27f23cc5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -777,6 +777,7 @@ struct intel_csr {
>         func(has_guc_sched) sep \
>         func(has_rc6) sep \
>         func(has_rc6p) sep \
> +       func(has_dp_mst) sep \
>         func(has_resource_streamer) sep \
>         func(has_pipe_cxsr) sep \
>         func(has_hotplug) sep \
> @@ -2851,9 +2852,7 @@ struct drm_i915_cmd_table {
>
>  #define HAS_IPS(dev)           (IS_HSW_ULT(dev) || IS_BROADWELL(dev))
>
> -#define HAS_DP_MST(dev)                (IS_HASWELL(dev) || IS_BROADWELL(dev) || \
> -                                INTEL_INFO(dev)->gen >= 9)

= hsw, bdw, skl, kbl, bxt.

> -
> +#define HAS_DP_MST(dev)                (INTEL_INFO(dev)->has_dp_mst)
>  #define HAS_DDI(dev)           (INTEL_INFO(dev)->has_ddi)
>  #define HAS_FPGA_DBG_UNCLAIMED(dev)    (INTEL_INFO(dev)->has_fpga_dbg)
>  #define HAS_PSR(dev)           (INTEL_INFO(dev)->has_psr)
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index c6dae2c..099f134 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -279,7 +279,8 @@ static const struct intel_device_info intel_valleyview_d_info = {
>         .has_fpga_dbg = 1, \
>         .has_psr = 1, \
>         .has_runtime_pm = 1, \
> -       .has_resource_streamer = 1
> +       .has_resource_streamer = 1, \
> +       .has_dp_mst = 1
>
>  static const struct intel_device_info intel_haswell_d_info = {
>         HSW_FEATURES,
> @@ -331,6 +332,7 @@ static const struct intel_device_info intel_cherryview_info = {
>         .has_runtime_pm = 1,
>         .has_resource_streamer = 1,
>         .has_rc6 = 1,
> +       .has_dp_mst = 1,

This is in the wrong block.
Cherryview is gen8. This one here should be in broxton.

>         .display_mmio_offset = VLV_DISPLAY_BASE,
>         GEN_CHV_PIPEOFFSETS,
>         CURSOR_OFFSETS,
> --
> 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


More information about the Intel-gfx mailing list