| Message ID | 1352219142-1395-7-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 06 Nov 2012, Ben Widawsky <ben@bwidawsk.net> wrote: > From: "Xiang, Haihao" <haihao.xiang@intel.com> > > The flag will be useful to help share code between IVB, and HSW as the > programming is similar in many places with this as one of the major > differences. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> > [Commit message + small fix by] > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > --- > drivers/gpu/drm/i915/i915_dma.c | 2 +- > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > 3 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 1eea5be..80511fc 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1442,7 +1442,7 @@ static void i915_dump_device_info(struct drm_i915_private *dev_priv) > #define DEV_INFO_FLAG(name) info->name ? #name "," : "" > #define DEV_INFO_SEP , > DRM_DEBUG_DRIVER("i915 device info: gen=%i, pciid=0x%04x flags=" > - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", > + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", > info->gen, > dev_priv->dev->pdev->device, > DEV_INFO_FLAGS); > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index f8ba5fe..106becf5c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -287,6 +287,7 @@ static const struct intel_device_info intel_haswell_d_info = { > .has_blt_ring = 1, > .has_llc = 1, > .has_force_wake = 1, > + .has_vebox_ring = 1, > }; > > static const struct intel_device_info intel_haswell_m_info = { > @@ -296,6 +297,7 @@ static const struct intel_device_info intel_haswell_m_info = { > .has_blt_ring = 1, > .has_llc = 1, > .has_force_wake = 1, > + .has_vebox_ring = 1, > }; > > static const struct pci_device_id pciidlist[] = { /* aka */ > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index f316916..c103b9d 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -311,6 +311,7 @@ struct drm_i915_gt_funcs { > DEV_INFO_FLAG(supports_tv) DEV_INFO_SEP \ > DEV_INFO_FLAG(has_bsd_ring) DEV_INFO_SEP \ > DEV_INFO_FLAG(has_blt_ring) DEV_INFO_SEP \ > + DEV_INFO_FLAG(has_vebox_ring) DEV_INFO_SEP \ > DEV_INFO_FLAG(has_llc) > > struct intel_device_info { > @@ -339,6 +340,7 @@ struct intel_device_info { > u8 has_bsd_ring:1; > u8 has_blt_ring:1; > u8 has_llc:1; > + u8 has_vebox_ring:1; > }; > > #define I915_PPGTT_PD_ENTRIES 512 > @@ -1177,6 +1179,7 @@ struct drm_i915_file_private { > > #define HAS_BSD(dev) (INTEL_INFO(dev)->has_bsd_ring) > #define HAS_BLT(dev) (INTEL_INFO(dev)->has_blt_ring) > +#define HAS_VEBOX(dev) (INTEL_INFO(dev)->has_vebox_ring) > #define HAS_LLC(dev) (INTEL_INFO(dev)->has_llc) > #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) > > -- > 1.8.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 1eea5be..80511fc 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1442,7 +1442,7 @@ static void i915_dump_device_info(struct drm_i915_private *dev_priv) #define DEV_INFO_FLAG(name) info->name ? #name "," : "" #define DEV_INFO_SEP , DRM_DEBUG_DRIVER("i915 device info: gen=%i, pciid=0x%04x flags=" - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", info->gen, dev_priv->dev->pdev->device, DEV_INFO_FLAGS); diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f8ba5fe..106becf5c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -287,6 +287,7 @@ static const struct intel_device_info intel_haswell_d_info = { .has_blt_ring = 1, .has_llc = 1, .has_force_wake = 1, + .has_vebox_ring = 1, }; static const struct intel_device_info intel_haswell_m_info = { @@ -296,6 +297,7 @@ static const struct intel_device_info intel_haswell_m_info = { .has_blt_ring = 1, .has_llc = 1, .has_force_wake = 1, + .has_vebox_ring = 1, }; static const struct pci_device_id pciidlist[] = { /* aka */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f316916..c103b9d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -311,6 +311,7 @@ struct drm_i915_gt_funcs { DEV_INFO_FLAG(supports_tv) DEV_INFO_SEP \ DEV_INFO_FLAG(has_bsd_ring) DEV_INFO_SEP \ DEV_INFO_FLAG(has_blt_ring) DEV_INFO_SEP \ + DEV_INFO_FLAG(has_vebox_ring) DEV_INFO_SEP \ DEV_INFO_FLAG(has_llc) struct intel_device_info { @@ -339,6 +340,7 @@ struct intel_device_info { u8 has_bsd_ring:1; u8 has_blt_ring:1; u8 has_llc:1; + u8 has_vebox_ring:1; }; #define I915_PPGTT_PD_ENTRIES 512 @@ -1177,6 +1179,7 @@ struct drm_i915_file_private { #define HAS_BSD(dev) (INTEL_INFO(dev)->has_bsd_ring) #define HAS_BLT(dev) (INTEL_INFO(dev)->has_blt_ring) +#define HAS_VEBOX(dev) (INTEL_INFO(dev)->has_vebox_ring) #define HAS_LLC(dev) (INTEL_INFO(dev)->has_llc) #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws)