On Tue, Aug 09, 2016 at 11:45:23AM -0700, Carlos Santa wrote: > Moving all GPU features to the platform definition allows for > - standard place when adding new features from new platforms > - possible to see supported features when dumping struct > definitions >
Reviewed-by: Rodrigo Vivi <[email protected]> > Signed-off-by: Carlos Santa <[email protected]> > --- > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > drivers/gpu/drm/i915/i915_pci.c | 5 ++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 919ae65..18c9fc5 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -779,6 +779,7 @@ struct intel_csr { > func(has_dp_mst) sep \ > func(has_gmbus_irq) sep \ > func(has_hw_contexts) sep \ > + func(has_logical_ring_contexts) sep \ > func(has_pipe_cxsr) sep \ > func(has_hotplug) sep \ > func(cursor_needs_physical) sep \ > @@ -2731,7 +2732,7 @@ struct drm_i915_cmd_table { > #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) > > #define HAS_HW_CONTEXTS(dev) (INTEL_INFO(dev)->has_hw_contexts) > -#define HAS_LOGICAL_RING_CONTEXTS(dev) (INTEL_INFO(dev)->gen >= 8) > +#define HAS_LOGICAL_RING_CONTEXTS(dev) > (INTEL_INFO(dev)->has_logical_ring_contexts) > #define USES_PPGTT(dev) (i915.enable_ppgtt) > #define USES_FULL_PPGTT(dev) (i915.enable_ppgtt >= 2) > #define USES_FULL_48BIT_PPGTT(dev) (i915.enable_ppgtt == 3) > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 9d42b68..db15fc2 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -276,7 +276,8 @@ static const struct intel_device_info intel_haswell_info > = { > > #define BDW_FEATURES \ > HSW_FEATURES, \ > - BDW_COLORS > + BDW_COLORS, \ > + .has_logical_ring_contexts = 1 > > static const struct intel_device_info intel_broadwell_info = { > BDW_FEATURES, > @@ -302,6 +303,7 @@ static const struct intel_device_info > intel_cherryview_info = { > .has_rc6 = 1, > .has_gmbus_irq = 1, > .has_hw_contexts = 1, > + .has_logical_ring_contexts = 1, > .display_mmio_offset = VLV_DISPLAY_BASE, > GEN_CHV_PIPEOFFSETS, > CURSOR_OFFSETS, > @@ -340,6 +342,7 @@ static const struct intel_device_info intel_broxton_info > = { > .has_dp_mst = 1, > .has_gmbus_irq = 1, > .has_hw_contexts = 1, > + .has_logical_ring_contexts = 1, > GEN_DEFAULT_PIPEOFFSETS, > IVB_CURSOR_OFFSETS, > BDW_COLORS, > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
