aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoath, Nicholas <nicholas.hoath@intel.com>2015-02-05 05:47:17 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-13 17:28:07 -0500
commite90a21d45d7ea269e6700208809a92d35c0c2362 (patch)
treecadf458fff05709a3cee94c8e2375bfc898b2eaa
parent3b10653178473c44e8909b5f23ab6f515fb63259 (diff)
drm/i915: ring w/a gen 9 revision definitions
Add Skylake stepping Revision IDs definitions. v1: Use existing revision id. Signed-off-by: Nick Hoath <nicholas.hoath@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> [danvet: Use magic __I915__ and bikeshed #defines as suggested by Damien.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ddfa701d1b9f..217845951b7f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2339,6 +2339,7 @@ struct drm_i915_cmd_table {
2339}) 2339})
2340#define INTEL_INFO(p) (&__I915__(p)->info) 2340#define INTEL_INFO(p) (&__I915__(p)->info)
2341#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) 2341#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id)
2342#define INTEL_REVID(p) (__I915__(p)->dev->pdev->revision)
2342 2343
2343#define IS_I830(dev) (INTEL_DEVID(dev) == 0x3577) 2344#define IS_I830(dev) (INTEL_DEVID(dev) == 0x3577)
2344#define IS_845G(dev) (INTEL_DEVID(dev) == 0x2562) 2345#define IS_845G(dev) (INTEL_DEVID(dev) == 0x2562)
@@ -2387,6 +2388,11 @@ struct drm_i915_cmd_table {
2387 INTEL_DEVID(dev) == 0x0A1E) 2388 INTEL_DEVID(dev) == 0x0A1E)
2388#define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary) 2389#define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)
2389 2390
2391#define SKL_REVID_A0 (0x0)
2392#define SKL_REVID_B0 (0x1)
2393#define SKL_REVID_C0 (0x2)
2394#define SKL_REVID_D0 (0x3)
2395
2390/* 2396/*
2391 * The genX designation typically refers to the render engine, so render 2397 * The genX designation typically refers to the render engine, so render
2392 * capability related checks should use IS_GEN, while display and other checks 2398 * capability related checks should use IS_GEN, while display and other checks