On Friday, August 07, 2015 01:58:37 PM Ben Widawsky wrote: > We do not want bug reports from this early stepping of SKL. Few if any were > ever > shipped outside of Intel to early enabling partners, and none will be sold. > > There is a functional change here. If you're using new mesa on an old > kernel/libdrm, the revid will be -1, and we'll use new SKL values instead of > early ones (a hopefully irrelevant improvement IMO). > > Cc: Jason Ekstrand <ja...@jlekstrand.net> > Cc: Neil Roberts <n...@linux.intel.com> > Signed-off-by: Ben Widawsky <b...@bwidawsk.net> > --- > src/mesa/drivers/dri/i965/brw_device_info.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c > b/src/mesa/drivers/dri/i965/brw_device_info.c > index be517e8..fc89221 100644 > --- a/src/mesa/drivers/dri/i965/brw_device_info.c > +++ b/src/mesa/drivers/dri/i965/brw_device_info.c > @@ -322,10 +322,7 @@ static const struct brw_device_info brw_device_info_chv > = { > .max_gs_entries = 640, \ > } > > -static const struct brw_device_info brw_device_info_skl_early = { > - GEN9_FEATURES, .gt = 1, > - .supports_simd16_3src = false, > -}; > +#define IS_SKL(devinfo) ((devinfo)->gen == 9 && !(devinfo)->is_broxton) > > static const struct brw_device_info brw_device_info_skl_gt1 = { > GEN9_FEATURES, .gt = 1, > @@ -376,10 +373,12 @@ brw_get_device_info(int devid, int revision) > return NULL; > } > > - if (devinfo->gen == 9 && > - !devinfo->is_broxton && > - (revision == 2 || revision == 3 || revision == -1)) > - return &brw_device_info_skl_early; > + if (IS_SKL(devinfo) && (revision != -1 && revision <= 3)) { > + fprintf(stderr, > + "i965_dri.so does not support this PCI ID with revision %d.\n", > + revision); > + return NULL; > + } > > return devinfo; > } >
Personally, I'd just delete the code, but if you think this will avoid annoying bug reports from intel people, then I suppose it's not hurting anything... Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev