diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-08 16:01:51 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-09 12:29:21 -0400 |
commit | c96ea64ebbbe911becccb20dea1609017caad3c9 (patch) | |
tree | 0a5abbe3e3d058c3fd6866c4ba11fa385f62bbcf /drivers/gpu/drm/i915/i915_dma.c | |
parent | 65bccb5c708bd9f00d24f041f4f7c45130359448 (diff) |
drm/i915: dump the device info
Handy for lazy people like me, or when people forget to add the output
of lspci -nn.
v2: Chris Wilson noticed that we have this duplicated already in the
i915_capabilites debugfs file. But there \n as separator looks better,
which would be a bit verbose in dmesg. Abuse the preprocessor to
extract this all.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index d57ea1672134..a7a213cf06fb 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1428,6 +1428,21 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) | |||
1428 | kfree(ap); | 1428 | kfree(ap); |
1429 | } | 1429 | } |
1430 | 1430 | ||
1431 | static void i915_dump_device_info(struct drm_i915_private *dev_priv) | ||
1432 | { | ||
1433 | const struct intel_device_info *info = dev_priv->info; | ||
1434 | |||
1435 | #define DEV_INFO_FLAG(name) info->name ? #name "," : "" | ||
1436 | #define DEV_INFO_SEP , | ||
1437 | DRM_DEBUG_DRIVER("i915 device info: gen=%i, pciid=0x%04x flags=" | ||
1438 | "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", | ||
1439 | info->gen, | ||
1440 | dev_priv->dev->pdev->device, | ||
1441 | DEV_INFO_FLAGS); | ||
1442 | #undef DEV_INFO_FLAG | ||
1443 | #undef DEV_INFO_SEP | ||
1444 | } | ||
1445 | |||
1431 | /** | 1446 | /** |
1432 | * i915_driver_load - setup chip and create an initial config | 1447 | * i915_driver_load - setup chip and create an initial config |
1433 | * @dev: DRM device | 1448 | * @dev: DRM device |
@@ -1452,7 +1467,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1452 | if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET)) | 1467 | if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET)) |
1453 | return -ENODEV; | 1468 | return -ENODEV; |
1454 | 1469 | ||
1455 | |||
1456 | /* i915 has 4 more counters */ | 1470 | /* i915 has 4 more counters */ |
1457 | dev->counters += 4; | 1471 | dev->counters += 4; |
1458 | dev->types[6] = _DRM_STAT_IRQ; | 1472 | dev->types[6] = _DRM_STAT_IRQ; |
@@ -1468,6 +1482,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1468 | dev_priv->dev = dev; | 1482 | dev_priv->dev = dev; |
1469 | dev_priv->info = info; | 1483 | dev_priv->info = info; |
1470 | 1484 | ||
1485 | i915_dump_device_info(dev_priv); | ||
1486 | |||
1471 | if (i915_get_bridge_dev(dev)) { | 1487 | if (i915_get_bridge_dev(dev)) { |
1472 | ret = -EIO; | 1488 | ret = -EIO; |
1473 | goto free_priv; | 1489 | goto free_priv; |