All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
To: Michel Thierry <michel.thierry@intel.com>,
	intel-gfx@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>,
	dri-devel@lists.freedesktop.org,
	Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PATCH libdrm] intel: add support for ICL 11
Date: Tue, 01 May 2018 14:40:51 -0700	[thread overview]
Message-ID: <1525210851.2704.16.camel@intel.com> (raw)
In-Reply-To: <5178bdad-fb78-c05f-068c-1a5c0d337cda@intel.com>

Em Qua, 2018-04-25 às 17:29 -0700, Michel Thierry escreveu:
> On 04/25/2018 05:09 PM, Paulo Zanoni wrote:
> > Add the PCI IDs and the basic code to enable ICL.  This is the
> > current
> > PCI ID list in our documentation.
> > 
> > Kernel commit: d55cb4fa2cf0 ("drm/i915/icl: Add the ICL PCI IDs")
> > 
> > v2: Michel provided a fix to IS_9XX that was broken by rebase bot.
> > v3: Fix double definition of PCI IDs, update IDs according to bspec
> >      and keep them in the same order and rebase (Lucas)
> > 
> > Cc: Michel Thierry <michel.thierry@intel.com>
> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >   intel/intel_bufmgr_gem.c |  2 ++
> >   intel/intel_chipset.h    | 27 ++++++++++++++++++++++++++-
> >   intel/intel_decode.c     |  4 +++-
> >   3 files changed, 31 insertions(+), 2 deletions(-)
> > 
> > diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
> > index 5c47a46f..8c3a4b20 100644
> > --- a/intel/intel_bufmgr_gem.c
> > +++ b/intel/intel_bufmgr_gem.c
> > @@ -3660,6 +3660,8 @@ drm_intel_bufmgr_gem_init(int fd, int
> > batch_size)
> >   		bufmgr_gem->gen = 9;
> >   	else if (IS_GEN10(bufmgr_gem->pci_device))
> >   		bufmgr_gem->gen = 10;
> > +	else if (IS_GEN11(bufmgr_gem->pci_device))
> > +		bufmgr_gem->gen = 11;
> >   	else {
> >   		free(bufmgr_gem);
> >   		bufmgr_gem = NULL;
> > diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
> > index ba2e3ac1..32b2c48f 100644
> > --- a/intel/intel_chipset.h
> > +++ b/intel/intel_chipset.h
> > @@ -257,6 +257,16 @@
> >   #define PCI_CHIP_CANNONLAKE_12		0x5A44
> >   #define PCI_CHIP_CANNONLAKE_13		0x5A4C
> >   
> > +#define PCI_CHIP_ICELAKE_11_0		0x8A50
> > +#define PCI_CHIP_ICELAKE_11_1		0x8A51
> > +#define PCI_CHIP_ICELAKE_11_2		0x8A5C
> > +#define PCI_CHIP_ICELAKE_11_3		0x8A5D
> > +#define PCI_CHIP_ICELAKE_11_4		0x8A52
> > +#define PCI_CHIP_ICELAKE_11_5		0x8A5A
> > +#define PCI_CHIP_ICELAKE_11_6		0x8A5B
> > +#define PCI_CHIP_ICELAKE_11_7		0x8A71
> > +#define PCI_CHIP_ICELAKE_11_8		0x8A70
> > +
> 
> matches what we have in the kernel's i915_pciids.h
> 
> >   #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
> >   				 (devid) == PCI_CHIP_I915_GM || \
> >   				 (devid) == PCI_CHIP_I945_GM || \
> > @@ -538,6 +548,20 @@
> >   
> >   #define IS_GEN10(devid)		(IS_CANNONLAKE(devid))
> >   
> > +#define IS_ICELAKE_11(devid)	((devid) ==
> > PCI_CHIP_ICELAKE_11_0 || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_1
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_2
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_3
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_4
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_5
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_6
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_7
> > || \
> > +				 (devid) == PCI_CHIP_ICELAKE_11_8)
> > +
> > +#define IS_ICELAKE(devid)	(IS_ICELAKE_11(devid))
> > +
> > +#define IS_GEN11(devid)		(IS_ICELAKE_11(devid))
> > +
> >   #define IS_9XX(dev)		(IS_GEN3(dev) || \
> >   				 IS_GEN4(dev) || \
> >   				 IS_GEN5(dev) || \
> > @@ -545,6 +569,7 @@
> >   				 IS_GEN7(dev) || \
> >   				 IS_GEN8(dev) || \
> >   				 IS_GEN9(dev) || \
> > -				 IS_GEN10(dev))
> > +				 IS_GEN10(dev) || \
> > +				 IS_GEN11(dev))
> >   
> >   #endif /* _INTEL_CHIPSET_H */
> > diff --git a/intel/intel_decode.c b/intel/intel_decode.c
> > index bc7b04b8..b24861b1 100644
> > --- a/intel/intel_decode.c
> > +++ b/intel/intel_decode.c
> > @@ -3823,7 +3823,9 @@ drm_intel_decode_context_alloc(uint32_t
> > devid)
> >   	ctx->devid = devid;
> >   	ctx->out = stdout;
> >   
> > -	if (IS_GEN10(devid))
> > +	if (IS_GEN11(devid))
> > +		ctx->gen = 11;
> > +	else if (IS_GEN10(devid))
> >   		ctx->gen = 10;
> >   	else if (IS_GEN9(devid))
> >   		ctx->gen = 9;
> > 
> 
> Reviewed-by: Michel Thierry <michel.thierry@intel.com>

Patch merged. Thanks everybody involved.

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2018-05-01 21:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26  0:09 [PATCH libdrm] intel: add support for ICL 11 Paulo Zanoni
2018-04-26  0:29 ` Michel Thierry
2018-05-01 21:40   ` Paulo Zanoni [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1525210851.2704.16.camel@intel.com \
    --to=paulo.r.zanoni@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=lucas.demarchi@intel.com \
    --cc=michel.thierry@intel.com \
    --cc=rodrigo.vivi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.