On Fri, Dec 04, 2015 at 11:24:39AM +0100, Daniel Vetter wrote: > On Wed, Dec 02, 2015 at 01:28:14PM -0800, Wayne Boyer wrote: > > Beginning with gen7, newer devices repetitively redefine values > > for the device info structure members. This patch simplifies the > > structure definitions by grouping member value definitions into the > > existing GEN7_FEATURES #define and into the new GEN7_LP_FEATURES > > and HSW_FEATURES #defines. > > > > Specifically, GEN_DEFAULT_PIPEOFFSETS and IVB_CURSOR_OFFSETS are > > added to GEN7_FEATURES and subsequent IVB definitions are simplified. > > > > VLV_FEATURES is defined to differentiate and simplify the > > gen7 low power (LP) devices. > > > > HSW_FEATURES is defined and used to simplify all HSW+ devices > > except for LP. > > > > v2: Use VLV_FEATURES for the gen7 low power devices. (Jani) > > > > Cc: Rodrigo Vivi <[email protected]> > > Signed-off-by: Wayne Boyer <[email protected]> > > Queued for -next, thanks for the patch. > > > static const struct intel_device_info intel_skylake_info = { > > + HSW_FEATURES, > > .is_skylake = 1, > > - .gen = 9, .num_pipes = 3, > > - .need_gfx_hws = 1, .has_hotplug = 1, > > - .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, > > - .has_llc = 1, > > - .has_ddi = 1, > > - .has_fpga_dbg = 1, > > - .has_fbc = 1, > > - GEN_DEFAULT_PIPEOFFSETS, > > - IVB_CURSOR_OFFSETS, > > + .gen = 9, > > }; > > > > static const struct intel_device_info intel_skylake_gt3_info = { > > .is_skylake = 1, > > - .gen = 9, .num_pipes = 3, > > - .need_gfx_hws = 1, .has_hotplug = 1, > > + .gen = 9, > > .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, > > - .has_llc = 1, > > - .has_ddi = 1, > > - .has_fpga_dbg = 1, > > - .has_fbc = 1, > > - GEN_DEFAULT_PIPEOFFSETS, > > - IVB_CURSOR_OFFSETS, > > };
Ooops. -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
