From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>,
dri-devel@freedesktop.org, Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH libdrm v2 3/5] intel: make gen10 use generic gen macro
Date: Tue, 28 Aug 2018 17:35:30 -0700 [thread overview]
Message-ID: <20180829003532.22878-4-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20180829003532.22878-1-lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
intel/intel_chipset.c | 1 +
intel/intel_chipset.h | 34 +---------------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/intel/intel_chipset.c b/intel/intel_chipset.c
index 5a549ba4..0c2ba884 100644
--- a/intel/intel_chipset.c
+++ b/intel/intel_chipset.c
@@ -35,6 +35,7 @@ static const struct pci_device {
uint16_t gen;
} pciids[] = {
INTEL_ICL_11_IDS(11),
+ INTEL_CNL_IDS(10),
};
bool intel_is_genx(unsigned int devid, int gen)
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 2bf480d1..6790f728 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -246,21 +246,6 @@
#define PCI_CHIP_WHISKEYLAKE_U_GT3_2 0x3EA3
#define PCI_CHIP_WHISKEYLAKE_U_GT3_3 0x3EA4
-#define PCI_CHIP_CANNONLAKE_0 0x5A51
-#define PCI_CHIP_CANNONLAKE_1 0x5A59
-#define PCI_CHIP_CANNONLAKE_2 0x5A41
-#define PCI_CHIP_CANNONLAKE_3 0x5A49
-#define PCI_CHIP_CANNONLAKE_4 0x5A52
-#define PCI_CHIP_CANNONLAKE_5 0x5A5A
-#define PCI_CHIP_CANNONLAKE_6 0x5A42
-#define PCI_CHIP_CANNONLAKE_7 0x5A4A
-#define PCI_CHIP_CANNONLAKE_8 0x5A50
-#define PCI_CHIP_CANNONLAKE_9 0x5A40
-#define PCI_CHIP_CANNONLAKE_10 0x5A54
-#define PCI_CHIP_CANNONLAKE_11 0x5A5C
-#define PCI_CHIP_CANNONLAKE_12 0x5A44
-#define PCI_CHIP_CANNONLAKE_13 0x5A4C
-
#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \
(devid) == PCI_CHIP_I915_GM || \
(devid) == PCI_CHIP_I945_GM || \
@@ -527,29 +512,13 @@
IS_GEMINILAKE(devid) || \
IS_COFFEELAKE(devid))
-#define IS_CANNONLAKE(devid) ((devid) == PCI_CHIP_CANNONLAKE_0 || \
- (devid) == PCI_CHIP_CANNONLAKE_1 || \
- (devid) == PCI_CHIP_CANNONLAKE_2 || \
- (devid) == PCI_CHIP_CANNONLAKE_3 || \
- (devid) == PCI_CHIP_CANNONLAKE_4 || \
- (devid) == PCI_CHIP_CANNONLAKE_5 || \
- (devid) == PCI_CHIP_CANNONLAKE_6 || \
- (devid) == PCI_CHIP_CANNONLAKE_7 || \
- (devid) == PCI_CHIP_CANNONLAKE_8 || \
- (devid) == PCI_CHIP_CANNONLAKE_9 || \
- (devid) == PCI_CHIP_CANNONLAKE_10 || \
- (devid) == PCI_CHIP_CANNONLAKE_11 || \
- (devid) == PCI_CHIP_CANNONLAKE_12 || \
- (devid) == PCI_CHIP_CANNONLAKE_13)
-
-#define IS_GEN10(devid) (IS_CANNONLAKE(devid))
-
/* New platforms use kernel pci ids */
#include <stdbool.h>
bool intel_is_genx(unsigned int devid, int gen);
bool intel_get_genx(unsigned int devid, int *gen);
+#define IS_GEN10(devid) intel_is_genx(devid, 10)
#define IS_GEN11(devid) intel_is_genx(devid, 11)
/* all platforms */
@@ -560,7 +529,6 @@ bool intel_get_genx(unsigned int devid, int *gen);
IS_GEN7(dev) || \
IS_GEN8(dev) || \
IS_GEN9(dev) || \
- IS_GEN10(dev) || \
intel_get_genx(dev, NULL))
#endif /* _INTEL_CHIPSET_H */
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-08-29 0:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 0:35 [PATCH libdrm v2 0/5] intel: rework how we add PCI IDs Lucas De Marchi
2018-08-29 0:35 ` [PATCH libdrm v2 1/5] intel: add generic functions to check PCI ID Lucas De Marchi
2018-08-31 8:16 ` Chris Wilson
2018-08-31 16:06 ` Lucas De Marchi
2018-08-31 16:13 ` Chris Wilson
2018-08-29 0:35 ` [PATCH libdrm v2 2/5] intel: make gen11 use generic gen macro Lucas De Marchi
2018-08-29 0:35 ` Lucas De Marchi [this message]
2018-08-29 0:35 ` [PATCH libdrm v2 4/5] intel: make gen9 " Lucas De Marchi
2018-08-29 10:32 ` Chris Wilson
2018-08-29 16:01 ` Lucas De Marchi
2018-08-31 8:20 ` Chris Wilson
2018-08-31 8:21 ` Chris Wilson
2018-08-31 16:14 ` Lucas De Marchi
2018-08-29 0:35 ` [PATCH libdrm v2 5/5] intel: get gen once for gen >= 9 Lucas De Marchi
2018-08-29 14:31 ` Chris Wilson
2018-09-05 18:01 ` Lucas De Marchi
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=20180829003532.22878-4-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=dri-devel@freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@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.