diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index f4231185ec7d..d4c176b7d76e 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1488,6 +1488,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1488 | 1488 | ||
1489 | i915_dump_device_info(dev_priv); | 1489 | i915_dump_device_info(dev_priv); |
1490 | 1490 | ||
1491 | /* Not all pre-production machines fall into this category, only the | ||
1492 | * very first ones. Almost everything should work, except for maybe | ||
1493 | * suspend/resume. And we don't implement workarounds that affect only | ||
1494 | * pre-production machines. */ | ||
1495 | if (IS_HSW_EARLY_SDV(dev)) | ||
1496 | DRM_INFO("This is an early pre-production Haswell machine. " | ||
1497 | "It may not be fully functional.\n"); | ||
1498 | |||
1491 | if (i915_get_bridge_dev(dev)) { | 1499 | if (i915_get_bridge_dev(dev)) { |
1492 | ret = -EIO; | 1500 | ret = -EIO; |
1493 | goto free_priv; | 1501 | goto free_priv; |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 6d07467d0e7e..2e7d5f9524f7 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1511,6 +1511,8 @@ struct drm_i915_file_private { | |||
1511 | #define IS_VALLEYVIEW(dev) (INTEL_INFO(dev)->is_valleyview) | 1511 | #define IS_VALLEYVIEW(dev) (INTEL_INFO(dev)->is_valleyview) |
1512 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) | 1512 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) |
1513 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) | 1513 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) |
1514 | #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ | ||
1515 | ((dev)->pci_device & 0xFF00) == 0x0C00) | ||
1514 | #define IS_ULT(dev) (IS_HASWELL(dev) && \ | 1516 | #define IS_ULT(dev) (IS_HASWELL(dev) && \ |
1515 | ((dev)->pci_device & 0xFF00) == 0x0A00) | 1517 | ((dev)->pci_device & 0xFF00) == 0x0A00) |
1516 | 1518 | ||