| Message ID | 20170911161134.31608-1-anuj.phogat@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 11, 2017 at 04:11:33PM +0000, Anuj Phogat wrote: > See Mesa commits: ebc5ccf and b2dae9f I believe we need to be in sync between multiple gfx stack components, but I don't believe we should remove ids. In the past we had cases where we noticed a product group using a listed id to do a product and we just noticed the id after a user reported at fd.o. For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long. Also Xserver ids are nowadays in sync with Mesa ones and I believe some OSVs might take a while to upgrade the Xserver as well in case of a new found product with some "new" id. For this reason I was always in favor of adding all possible reserved ids from the beginning. And this approach worked well on BDW and SKL, where we've seeing later some reserved ids becoming real product and we didn't have to do any extra step. For this same reason I believe the right solution is to add those ids back to mesa instead of removing from kernel and libdrm. Thanks, Rodrigo. > > Cc: Matt Turner <mattst88@gmail.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> > --- > drivers/gpu/drm/i915/i915_pci.c | 1 - > include/drm/i915_pciids.h | 15 ++------------- > 2 files changed, 2 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 129877b..ecf6d4c 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = { > INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), > - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 1257e15..a1bf90e 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -337,15 +337,10 @@ > INTEL_VGA_DEVICE(0x3185, info) > > #define INTEL_KBL_GT1_IDS(info) \ > - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ > - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ > INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ > INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ > - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ > INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ > - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ > - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ > - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ > + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ > > #define INTEL_KBL_GT2_IDS(info) \ > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ > @@ -353,22 +348,16 @@ > INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ > INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ > - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ > INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ > > #define INTEL_KBL_GT3_IDS(info) \ > - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ > INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ > INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ > > -#define INTEL_KBL_GT4_IDS(info) \ > - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ > - > #define INTEL_KBL_IDS(info) \ > INTEL_KBL_GT1_IDS(info), \ > INTEL_KBL_GT2_IDS(info), \ > - INTEL_KBL_GT3_IDS(info), \ > - INTEL_KBL_GT4_IDS(info) > + INTEL_KBL_GT3_IDS(info) > > /* CFL S */ > #define INTEL_CFL_S_GT1_IDS(info) \ > -- > 2.9.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Sep 11, 2017 at 10:10 AM, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Mon, Sep 11, 2017 at 04:11:33PM +0000, Anuj Phogat wrote: >> See Mesa commits: ebc5ccf and b2dae9f > > I believe we need to be in sync between multiple gfx stack components, > but I don't believe we should remove ids. > > In the past we had cases where we noticed a product group using a listed > id to do a product and we just noticed the id after a user reported at fd.o. > > For us in kernel the cycle until that id gets into a stable release > propagated to OSVs distros can be a bit long. > > Also Xserver ids are nowadays in sync with Mesa ones and I believe some > OSVs might take a while to upgrade the Xserver as well in case of a new > found product with some "new" id. > > For this reason I was always in favor of adding all possible reserved ids from the > beginning. > > And this approach worked well on BDW and SKL, where we've seeing later some > reserved ids becoming real product and we didn't have to do any extra step. > > For this same reason I believe the right solution is to > add those ids back to mesa instead of removing from kernel and libdrm. > I'm fine with keeping the unused pci id's in Mesa tree and keep it uniform across multiple gfx stack components. I'll revert the Mesa patch. > Thanks, > Rodrigo. > >> >> Cc: Matt Turner <mattst88@gmail.com> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> >> --- >> drivers/gpu/drm/i915/i915_pci.c | 1 - >> include/drm/i915_pciids.h | 15 ++------------- >> 2 files changed, 2 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >> index 129877b..ecf6d4c 100644 >> --- a/drivers/gpu/drm/i915/i915_pci.c >> +++ b/drivers/gpu/drm/i915/i915_pci.c >> @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = { >> INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), >> INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), >> INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), >> - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), >> INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), >> INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), >> INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), >> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h >> index 1257e15..a1bf90e 100644 >> --- a/include/drm/i915_pciids.h >> +++ b/include/drm/i915_pciids.h >> @@ -337,15 +337,10 @@ >> INTEL_VGA_DEVICE(0x3185, info) >> >> #define INTEL_KBL_GT1_IDS(info) \ >> - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ >> - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ >> INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ >> INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ >> - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ >> INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ >> - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ >> - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ >> - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ >> + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ >> >> #define INTEL_KBL_GT2_IDS(info) \ >> INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ >> @@ -353,22 +348,16 @@ >> INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ >> INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ >> INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ >> - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ >> INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ >> >> #define INTEL_KBL_GT3_IDS(info) \ >> - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ >> INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ >> INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ >> >> -#define INTEL_KBL_GT4_IDS(info) \ >> - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ >> - >> #define INTEL_KBL_IDS(info) \ >> INTEL_KBL_GT1_IDS(info), \ >> INTEL_KBL_GT2_IDS(info), \ >> - INTEL_KBL_GT3_IDS(info), \ >> - INTEL_KBL_GT4_IDS(info) >> + INTEL_KBL_GT3_IDS(info) >> >> /* CFL S */ >> #define INTEL_CFL_S_GT1_IDS(info) \ >> -- >> 2.9.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu: > On Mon, Sep 11, 2017 at 04:11:33PM +0000, Anuj Phogat wrote: > > See Mesa commits: ebc5ccf and b2dae9f > > I believe we need to be in sync between multiple gfx stack > components, > but I don't believe we should remove ids. > > In the past we had cases where we noticed a product group using a > listed > id to do a product and we just noticed the id after a user reported > at fd.o. On the other hand, don't we have the risk that someone is going to see that these IDs are unused for KBL and them repurpose them om some future non-KBL product? > > For us in kernel the cycle until that id gets into a stable release > propagated to OSVs distros can be a bit long. > > Also Xserver ids are nowadays in sync with Mesa ones and I believe > some > OSVs might take a while to upgrade the Xserver as well in case of a > new > found product with some "new" id. > > For this reason I was always in favor of adding all possible reserved > ids from the > beginning. > > And this approach worked well on BDW and SKL, where we've seeing > later some > reserved ids becoming real product and we didn't have to do any extra > step. > > For this same reason I believe the right solution is to > add those ids back to mesa instead of removing from kernel and > libdrm. > > Thanks, > Rodrigo. > > > > > Cc: Matt Turner <mattst88@gmail.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> > > --- > > drivers/gpu/drm/i915/i915_pci.c | 1 - > > include/drm/i915_pciids.h | 15 ++------------- > > 2 files changed, 2 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c > > b/drivers/gpu/drm/i915/i915_pci.c > > index 129877b..ecf6d4c 100644 > > --- a/drivers/gpu/drm/i915/i915_pci.c > > +++ b/drivers/gpu/drm/i915/i915_pci.c > > @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = > > { > > INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), > > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), > > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), > > - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), > > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), > > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), > > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > > index 1257e15..a1bf90e 100644 > > --- a/include/drm/i915_pciids.h > > +++ b/include/drm/i915_pciids.h > > @@ -337,15 +337,10 @@ > > INTEL_VGA_DEVICE(0x3185, info) > > > > #define INTEL_KBL_GT1_IDS(info) \ > > - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ > > - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ > > INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ > > INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ > > - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ > > INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ > > - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ > > - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ > > - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ > > + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ > > > > #define INTEL_KBL_GT2_IDS(info) \ > > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ > > @@ -353,22 +348,16 @@ > > INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ > > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ > > INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ > > - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ > > INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ > > > > #define INTEL_KBL_GT3_IDS(info) \ > > - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ > > INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ > > INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ > > > > -#define INTEL_KBL_GT4_IDS(info) \ > > - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ > > - > > #define INTEL_KBL_IDS(info) \ > > INTEL_KBL_GT1_IDS(info), \ > > INTEL_KBL_GT2_IDS(info), \ > > - INTEL_KBL_GT3_IDS(info), \ > > - INTEL_KBL_GT4_IDS(info) > > + INTEL_KBL_GT3_IDS(info) > > > > /* CFL S */ > > #define INTEL_CFL_S_GT1_IDS(info) \ > > -- > > 2.9.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Sep 12, 2017 at 08:30:47PM +0000, Paulo Zanoni wrote: > Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu: > > On Mon, Sep 11, 2017 at 04:11:33PM +0000, Anuj Phogat wrote: > > > See Mesa commits: ebc5ccf and b2dae9f > > > > I believe we need to be in sync between multiple gfx stack > > components, > > but I don't believe we should remove ids. > > > > In the past we had cases where we noticed a product group using a > > listed > > id to do a product and we just noticed the id after a user reported > > at fd.o. > > On the other hand, don't we have the risk that someone is going to see > that these IDs are unused for KBL and them repurpose them om some > future non-KBL product? There is only risk if the id was removed from Spec. But when that happens I'm in favor of removing from the components as well. While it is listed there even without POR it is reserved. > > > > > For us in kernel the cycle until that id gets into a stable release > > propagated to OSVs distros can be a bit long. > > > > Also Xserver ids are nowadays in sync with Mesa ones and I believe > > some > > OSVs might take a while to upgrade the Xserver as well in case of a > > new > > found product with some "new" id. > > > > For this reason I was always in favor of adding all possible reserved > > ids from the > > beginning. > > > > And this approach worked well on BDW and SKL, where we've seeing > > later some > > reserved ids becoming real product and we didn't have to do any extra > > step. > > > > For this same reason I believe the right solution is to > > add those ids back to mesa instead of removing from kernel and > > libdrm. > > > > Thanks, > > Rodrigo. > > > > > > > > Cc: Matt Turner <mattst88@gmail.com> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> > > > --- > > > drivers/gpu/drm/i915/i915_pci.c | 1 - > > > include/drm/i915_pciids.h | 15 ++------------- > > > 2 files changed, 2 insertions(+), 14 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c > > > b/drivers/gpu/drm/i915/i915_pci.c > > > index 129877b..ecf6d4c 100644 > > > --- a/drivers/gpu/drm/i915/i915_pci.c > > > +++ b/drivers/gpu/drm/i915/i915_pci.c > > > @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = > > > { > > > INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), > > > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), > > > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), > > > - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), > > > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), > > > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), > > > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), > > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > > > index 1257e15..a1bf90e 100644 > > > --- a/include/drm/i915_pciids.h > > > +++ b/include/drm/i915_pciids.h > > > @@ -337,15 +337,10 @@ > > > INTEL_VGA_DEVICE(0x3185, info) > > > > > > #define INTEL_KBL_GT1_IDS(info) \ > > > - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ > > > - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ > > > INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ > > > INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ > > > - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ > > > INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ > > > - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ > > > - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ > > > - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ > > > + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ > > > > > > #define INTEL_KBL_GT2_IDS(info) \ > > > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ > > > @@ -353,22 +348,16 @@ > > > INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ > > > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ > > > INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ > > > - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ > > > INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ > > > > > > #define INTEL_KBL_GT3_IDS(info) \ > > > - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ > > > INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ > > > INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ > > > > > > -#define INTEL_KBL_GT4_IDS(info) \ > > > - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ > > > - > > > #define INTEL_KBL_IDS(info) \ > > > INTEL_KBL_GT1_IDS(info), \ > > > INTEL_KBL_GT2_IDS(info), \ > > > - INTEL_KBL_GT3_IDS(info), \ > > > - INTEL_KBL_GT4_IDS(info) > > > + INTEL_KBL_GT3_IDS(info) > > > > > > /* CFL S */ > > > #define INTEL_CFL_S_GT1_IDS(info) \ > > > -- > > > 2.9.4 > > > > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dropping this patch. On Tue, Sep 12, 2017 at 5:31 PM, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Tue, Sep 12, 2017 at 08:30:47PM +0000, Paulo Zanoni wrote: >> Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu: >> > On Mon, Sep 11, 2017 at 04:11:33PM +0000, Anuj Phogat wrote: >> > > See Mesa commits: ebc5ccf and b2dae9f >> > >> > I believe we need to be in sync between multiple gfx stack >> > components, >> > but I don't believe we should remove ids. >> > >> > In the past we had cases where we noticed a product group using a >> > listed >> > id to do a product and we just noticed the id after a user reported >> > at fd.o. >> >> On the other hand, don't we have the risk that someone is going to see >> that these IDs are unused for KBL and them repurpose them om some >> future non-KBL product? > > There is only risk if the id was removed from Spec. But when that happens I'm in favor > of removing from the components as well. > While it is listed there even without POR it is reserved. > >> >> > >> > For us in kernel the cycle until that id gets into a stable release >> > propagated to OSVs distros can be a bit long. >> > >> > Also Xserver ids are nowadays in sync with Mesa ones and I believe >> > some >> > OSVs might take a while to upgrade the Xserver as well in case of a >> > new >> > found product with some "new" id. >> > >> > For this reason I was always in favor of adding all possible reserved >> > ids from the >> > beginning. >> > >> > And this approach worked well on BDW and SKL, where we've seeing >> > later some >> > reserved ids becoming real product and we didn't have to do any extra >> > step. >> > >> > For this same reason I believe the right solution is to >> > add those ids back to mesa instead of removing from kernel and >> > libdrm. >> > >> > Thanks, >> > Rodrigo. >> > >> > > >> > > Cc: Matt Turner <mattst88@gmail.com> >> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> > > Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> >> > > --- >> > > drivers/gpu/drm/i915/i915_pci.c | 1 - >> > > include/drm/i915_pciids.h | 15 ++------------- >> > > 2 files changed, 2 insertions(+), 14 deletions(-) >> > > >> > > diff --git a/drivers/gpu/drm/i915/i915_pci.c >> > > b/drivers/gpu/drm/i915/i915_pci.c >> > > index 129877b..ecf6d4c 100644 >> > > --- a/drivers/gpu/drm/i915/i915_pci.c >> > > +++ b/drivers/gpu/drm/i915/i915_pci.c >> > > @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = >> > > { >> > > INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), >> > > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), >> > > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), >> > > - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), >> > > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), >> > > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), >> > > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), >> > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h >> > > index 1257e15..a1bf90e 100644 >> > > --- a/include/drm/i915_pciids.h >> > > +++ b/include/drm/i915_pciids.h >> > > @@ -337,15 +337,10 @@ >> > > INTEL_VGA_DEVICE(0x3185, info) >> > > >> > > #define INTEL_KBL_GT1_IDS(info) \ >> > > - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ >> > > - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ >> > > INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ >> > > INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ >> > > - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ >> > > INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ >> > > - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ >> > > - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ >> > > - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ >> > > + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ >> > > >> > > #define INTEL_KBL_GT2_IDS(info) \ >> > > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ >> > > @@ -353,22 +348,16 @@ >> > > INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ >> > > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ >> > > INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ >> > > - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ >> > > INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ >> > > >> > > #define INTEL_KBL_GT3_IDS(info) \ >> > > - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ >> > > INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ >> > > INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ >> > > >> > > -#define INTEL_KBL_GT4_IDS(info) \ >> > > - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ >> > > - >> > > #define INTEL_KBL_IDS(info) \ >> > > INTEL_KBL_GT1_IDS(info), \ >> > > INTEL_KBL_GT2_IDS(info), \ >> > > - INTEL_KBL_GT3_IDS(info), \ >> > > - INTEL_KBL_GT4_IDS(info) >> > > + INTEL_KBL_GT3_IDS(info) >> > > >> > > /* CFL S */ >> > > #define INTEL_CFL_S_GT1_IDS(info) \ >> > > -- >> > > 2.9.4 >> > > >> > > _______________________________________________ >> > > Intel-gfx mailing list >> > > Intel-gfx@lists.freedesktop.org >> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> > >> > _______________________________________________ >> > Intel-gfx mailing list >> > Intel-gfx@lists.freedesktop.org >> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 129877b..ecf6d4c 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = { INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), - INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 1257e15..a1bf90e 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info) #define INTEL_KBL_GT1_IDS(info) \ - INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \ INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */ #define INTEL_KBL_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ @@ -353,22 +348,16 @@ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ #define INTEL_KBL_GT3_IDS(info) \ - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ -#define INTEL_KBL_GT4_IDS(info) \ - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ - #define INTEL_KBL_IDS(info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT3_IDS(info) /* CFL S */ #define INTEL_CFL_S_GT1_IDS(info) \
See Mesa commits: ebc5ccf and b2dae9f Cc: Matt Turner <mattst88@gmail.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> --- drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-)