diff mbox

drm/i915: BDW: Adding Reserved PCI IDs.

Message ID 1402422067-5717-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodrigo Vivi June 10, 2014, 5:41 p.m. UTC
These PCI IDs are reserved on BSpec and can be used at any time in the future.
So let's add this now in order to avoid issues that we already faced on previous
platforms, like finding out about new ids when user reported accelaration weren't
enabled.

v2: Reserved IDs doesn't have GT defined. So, creating a separated list. (Ben)

Cc: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 include/drm/i915_pciids.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Ben Widawsky June 11, 2014, 5:47 p.m. UTC | #1
On Tue, Jun 10, 2014 at 10:41:07AM -0700, Rodrigo Vivi wrote:
> These PCI IDs are reserved on BSpec and can be used at any time in the future.
> So let's add this now in order to avoid issues that we already faced on previous
> platforms, like finding out about new ids when user reported accelaration weren't
> enabled.
> 
> v2: Reserved IDs doesn't have GT defined. So, creating a separated list. (Ben)
> 
> Cc: Ben Widawsky <ben@bwidawsk.net>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  include/drm/i915_pciids.h | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 0572035..0968478 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -237,13 +237,25 @@
>  #define INTEL_BDW_GT3D_IDS(info) \
>  	_INTEL_BDW_D_IDS(3, info)
>  
> +#define INTEL_BDW_RSVDM_IDS(info) \
> +	INTEL_VGA_DEVICE(0x1632, info), \
> +	INTEL_VGA_DEVICE(0x1636, info), \
> +	INTEL_VGA_DEVICE(0x163B, info), \
> +	INTEL_VGA_DEVICE(0x163A, info)
> +
> +#define INTEL_BDW_RSVDD_IDS(info) \
> +	INTEL_VGA_DEVICE(0x163D, info), \
> +	INTEL_VGA_DEVICE(0x163E, info)
> +
>  #define INTEL_BDW_M_IDS(info) \
>  	INTEL_BDW_GT12M_IDS(info), \
> -	INTEL_BDW_GT3M_IDS(info)
> +	INTEL_BDW_GT3M_IDS(info), \
> +	INTEL_BDW_RSVDM_IDS(info)
>  
>  #define INTEL_BDW_D_IDS(info) \
>  	INTEL_BDW_GT12D_IDS(info), \
> -	INTEL_BDW_GT3D_IDS(info)
> +	INTEL_BDW_GT3D_IDS(info), \
> +	INTEL_BDW_RSVDD_IDS(info)
>  
>  #define INTEL_CHV_IDS(info) \
>  	INTEL_VGA_DEVICE(0x22b0, info), \

I thought we saved off the GT info, but now that I actually look at the
code, we do not. Therefore, I actually think v1 is a better patch.

In either case, both v1 and v2 are:
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>

I apologize for the extra work.
Rodrigo Vivi June 13, 2014, 12:39 a.m. UTC | #2
Hi Daniel,

please consider to merge the first version. So we can move fwd with ddx
patche followed by proper marketing names.

Thanks,
Rodrigo.


On Wed, Jun 11, 2014 at 10:47 AM, Ben Widawsky <ben@bwidawsk.net> wrote:

> On Tue, Jun 10, 2014 at 10:41:07AM -0700, Rodrigo Vivi wrote:
> > These PCI IDs are reserved on BSpec and can be used at any time in the
> future.
> > So let's add this now in order to avoid issues that we already faced on
> previous
> > platforms, like finding out about new ids when user reported
> accelaration weren't
> > enabled.
> >
> > v2: Reserved IDs doesn't have GT defined. So, creating a separated list.
> (Ben)
> >
> > Cc: Ben Widawsky <ben@bwidawsk.net>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  include/drm/i915_pciids.h | 16 ++++++++++++++--
> >  1 file changed, 14 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> > index 0572035..0968478 100644
> > --- a/include/drm/i915_pciids.h
> > +++ b/include/drm/i915_pciids.h
> > @@ -237,13 +237,25 @@
> >  #define INTEL_BDW_GT3D_IDS(info) \
> >       _INTEL_BDW_D_IDS(3, info)
> >
> > +#define INTEL_BDW_RSVDM_IDS(info) \
> > +     INTEL_VGA_DEVICE(0x1632, info), \
> > +     INTEL_VGA_DEVICE(0x1636, info), \
> > +     INTEL_VGA_DEVICE(0x163B, info), \
> > +     INTEL_VGA_DEVICE(0x163A, info)
> > +
> > +#define INTEL_BDW_RSVDD_IDS(info) \
> > +     INTEL_VGA_DEVICE(0x163D, info), \
> > +     INTEL_VGA_DEVICE(0x163E, info)
> > +
> >  #define INTEL_BDW_M_IDS(info) \
> >       INTEL_BDW_GT12M_IDS(info), \
> > -     INTEL_BDW_GT3M_IDS(info)
> > +     INTEL_BDW_GT3M_IDS(info), \
> > +     INTEL_BDW_RSVDM_IDS(info)
> >
> >  #define INTEL_BDW_D_IDS(info) \
> >       INTEL_BDW_GT12D_IDS(info), \
> > -     INTEL_BDW_GT3D_IDS(info)
> > +     INTEL_BDW_GT3D_IDS(info), \
> > +     INTEL_BDW_RSVDD_IDS(info)
> >
> >  #define INTEL_CHV_IDS(info) \
> >       INTEL_VGA_DEVICE(0x22b0, info), \
>
> I thought we saved off the GT info, but now that I actually look at the
> code, we do not. Therefore, I actually think v1 is a better patch.
>
> In either case, both v1 and v2 are:
> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
>
> I apologize for the extra work.
>
> --
> Ben Widawsky, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
Jani Nikula June 24, 2014, 1:19 p.m. UTC | #3
On Fri, 13 Jun 2014, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> Hi Daniel,
>
> please consider to merge the first version. So we can move fwd with ddx
> patche followed by proper marketing names.

Pushed v1 to -fixes, thanks for the patch and review.

BR,
Jani.



>
> Thanks,
> Rodrigo.
>
>
> On Wed, Jun 11, 2014 at 10:47 AM, Ben Widawsky <ben@bwidawsk.net> wrote:
>
>> On Tue, Jun 10, 2014 at 10:41:07AM -0700, Rodrigo Vivi wrote:
>> > These PCI IDs are reserved on BSpec and can be used at any time in the
>> future.
>> > So let's add this now in order to avoid issues that we already faced on
>> previous
>> > platforms, like finding out about new ids when user reported
>> accelaration weren't
>> > enabled.
>> >
>> > v2: Reserved IDs doesn't have GT defined. So, creating a separated list.
>> (Ben)
>> >
>> > Cc: Ben Widawsky <ben@bwidawsk.net>
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > ---
>> >  include/drm/i915_pciids.h | 16 ++++++++++++++--
>> >  1 file changed, 14 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
>> > index 0572035..0968478 100644
>> > --- a/include/drm/i915_pciids.h
>> > +++ b/include/drm/i915_pciids.h
>> > @@ -237,13 +237,25 @@
>> >  #define INTEL_BDW_GT3D_IDS(info) \
>> >       _INTEL_BDW_D_IDS(3, info)
>> >
>> > +#define INTEL_BDW_RSVDM_IDS(info) \
>> > +     INTEL_VGA_DEVICE(0x1632, info), \
>> > +     INTEL_VGA_DEVICE(0x1636, info), \
>> > +     INTEL_VGA_DEVICE(0x163B, info), \
>> > +     INTEL_VGA_DEVICE(0x163A, info)
>> > +
>> > +#define INTEL_BDW_RSVDD_IDS(info) \
>> > +     INTEL_VGA_DEVICE(0x163D, info), \
>> > +     INTEL_VGA_DEVICE(0x163E, info)
>> > +
>> >  #define INTEL_BDW_M_IDS(info) \
>> >       INTEL_BDW_GT12M_IDS(info), \
>> > -     INTEL_BDW_GT3M_IDS(info)
>> > +     INTEL_BDW_GT3M_IDS(info), \
>> > +     INTEL_BDW_RSVDM_IDS(info)
>> >
>> >  #define INTEL_BDW_D_IDS(info) \
>> >       INTEL_BDW_GT12D_IDS(info), \
>> > -     INTEL_BDW_GT3D_IDS(info)
>> > +     INTEL_BDW_GT3D_IDS(info), \
>> > +     INTEL_BDW_RSVDD_IDS(info)
>> >
>> >  #define INTEL_CHV_IDS(info) \
>> >       INTEL_VGA_DEVICE(0x22b0, info), \
>>
>> I thought we saved off the GT info, but now that I actually look at the
>> code, we do not. Therefore, I actually think v1 is a better patch.
>>
>> In either case, both v1 and v2 are:
>> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
>>
>> I apologize for the extra work.
>>
>> --
>> Ben Widawsky, Intel Open Source Technology Center
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>
>
>
> -- 
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson June 24, 2014, 3:32 p.m. UTC | #4
On Tue, Jun 24, 2014 at 04:19:38PM +0300, Jani Nikula wrote:
> On Fri, 13 Jun 2014, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> > Hi Daniel,
> >
> > please consider to merge the first version. So we can move fwd with ddx
> > patche followed by proper marketing names.
> 
> Pushed v1 to -fixes, thanks for the patch and review.

Hey Rodrigo, I spotted another place we have identifier strings... In
xf86-video-intel/README. :|
-Chris
diff mbox

Patch

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 0572035..0968478 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -237,13 +237,25 @@ 
 #define INTEL_BDW_GT3D_IDS(info) \
 	_INTEL_BDW_D_IDS(3, info)
 
+#define INTEL_BDW_RSVDM_IDS(info) \
+	INTEL_VGA_DEVICE(0x1632, info), \
+	INTEL_VGA_DEVICE(0x1636, info), \
+	INTEL_VGA_DEVICE(0x163B, info), \
+	INTEL_VGA_DEVICE(0x163A, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+	INTEL_VGA_DEVICE(0x163D, info), \
+	INTEL_VGA_DEVICE(0x163E, info)
+
 #define INTEL_BDW_M_IDS(info) \
 	INTEL_BDW_GT12M_IDS(info), \
-	INTEL_BDW_GT3M_IDS(info)
+	INTEL_BDW_GT3M_IDS(info), \
+	INTEL_BDW_RSVDM_IDS(info)
 
 #define INTEL_BDW_D_IDS(info) \
 	INTEL_BDW_GT12D_IDS(info), \
-	INTEL_BDW_GT3D_IDS(info)
+	INTEL_BDW_GT3D_IDS(info), \
+	INTEL_BDW_RSVDD_IDS(info)
 
 #define INTEL_CHV_IDS(info) \
 	INTEL_VGA_DEVICE(0x22b0, info), \