| Message ID | 1483114645-29560-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
In subject: +Remove duplicate ring_mask. Less freaking out ensues. However, note that the gt3+ have BSD2 which is not inherited from BDW_FEATURES. -Chris
On Fri, Dec 30, 2016 at 04:25:31PM +0000, Chris Wilson wrote: > In subject: +Remove duplicate ring_mask. Less freaking out ensues. However, > note that the gt3+ have BSD2 which is not inherited from BDW_FEATURES. Wow, I was blind somehow, now idea how I came up with this. At least CI caught it nicely, too ;-) -Daniel
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 7435a73f6bc6..c52c699ed4d7 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -361,7 +361,6 @@ static const struct intel_device_info intel_skylake_gt3_info = { .has_csr = 1, .has_guc = 1, .ddb_size = 896, - .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, }; #define GEN9_LP_FEATURES \ @@ -421,7 +420,6 @@ static const struct intel_device_info intel_kabylake_gt3_info = { .has_csr = 1, .has_guc = 1, .ddb_size = 896, - .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, }; /*
It's the same as in BDW_FEATURES, no point being inconsistent about this. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 2 -- 1 file changed, 2 deletions(-)