Kabylake is gen 9.5 derivated from Skylake H0 stepping. So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
Signed-off-by: Rodrigo Vivi <[email protected]> --- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7374a0d..580c005 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { }) #define INTEL_INFO(p) (&__I915__(p)->info) #define INTEL_DEVID(p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID(p) (__I915__(p)->dev->pdev->revision) #define IS_I830(dev) (INTEL_DEVID(dev) == 0x3577) #define IS_845G(dev) (INTEL_DEVID(dev) == 0x2562) @@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table { #define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary) +#define INTEL_REVID(p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) + #define SKL_REVID_A0 (0x0) #define SKL_REVID_B0 (0x1) #define SKL_REVID_C0 (0x2) @@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table { #define SKL_REVID_E0 (0x4) #define SKL_REVID_F0 (0x5) +/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7) + #define BXT_REVID_A0 (0x0) #define BXT_REVID_B0 (0x3) #define BXT_REVID_C0 (0x9) -- 2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
