diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index bec58e86bd49..a1ba1557154c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -358,6 +358,7 @@ static const struct intel_device_info intel_cherryview_info = { | |||
358 | 358 | ||
359 | static const struct intel_device_info intel_skylake_info = { | 359 | static const struct intel_device_info intel_skylake_info = { |
360 | .is_preliminary = 1, | 360 | .is_preliminary = 1, |
361 | .is_skylake = 1, | ||
361 | .gen = 9, .num_pipes = 3, | 362 | .gen = 9, .num_pipes = 3, |
362 | .need_gfx_hws = 1, .has_hotplug = 1, | 363 | .need_gfx_hws = 1, .has_hotplug = 1, |
363 | .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, | 364 | .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7892428d2844..2c652e8f5726 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -551,6 +551,7 @@ struct intel_uncore { | |||
551 | func(is_ivybridge) sep \ | 551 | func(is_ivybridge) sep \ |
552 | func(is_valleyview) sep \ | 552 | func(is_valleyview) sep \ |
553 | func(is_haswell) sep \ | 553 | func(is_haswell) sep \ |
554 | func(is_skylake) sep \ | ||
554 | func(is_preliminary) sep \ | 555 | func(is_preliminary) sep \ |
555 | func(has_fbc) sep \ | 556 | func(has_fbc) sep \ |
556 | func(has_pipe_cxsr) sep \ | 557 | func(has_pipe_cxsr) sep \ |
@@ -2093,6 +2094,7 @@ struct drm_i915_cmd_table { | |||
2093 | #define IS_CHERRYVIEW(dev) (INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev)) | 2094 | #define IS_CHERRYVIEW(dev) (INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev)) |
2094 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) | 2095 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) |
2095 | #define IS_BROADWELL(dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev)) | 2096 | #define IS_BROADWELL(dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev)) |
2097 | #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake) | ||
2096 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) | 2098 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) |
2097 | #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ | 2099 | #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ |
2098 | (INTEL_DEVID(dev) & 0xFF00) == 0x0C00) | 2100 | (INTEL_DEVID(dev) & 0xFF00) == 0x0C00) |