UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Convert intel_device_info_dump into pretty printer 

Convert intel_device_info_dump into pretty printer to be
consistent with the rest of the driver code.

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171219114346.26308-2-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2017-12-19 11:43:45 +00:00 committed by Chris Wilson
parent a8c9b84969
commit eb10ed9a9e
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_drv.c
View File

@ -931,7 +931,11 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
intel_display_crc_init(dev_priv); intel_display_crc_init(dev_priv);
intel_device_info_dump(dev_priv); if (drm_debug & DRM_UT_DRIVER) {
struct drm_printer p = drm_debug_printer("i915 device info:");
intel_device_info_dump(&dev_priv->info, &p);
}
intel_detect_preproduction_hw(dev_priv); intel_detect_preproduction_hw(dev_priv);

3
drivers/gpu/drm/i915/i915_drv.h
View File

@ -4164,7 +4164,8 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
const char *intel_platform_name(enum intel_platform platform); const char *intel_platform_name(enum intel_platform platform);
void intel_device_info_runtime_init(struct drm_i915_private *dev_priv); void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
void intel_device_info_dump(struct drm_i915_private *dev_priv); void intel_device_info_dump(const struct intel_device_info *info,
struct drm_printer *p);
void intel_device_info_dump_flags(const struct intel_device_info *info, void intel_device_info_dump_flags(const struct intel_device_info *info,
struct drm_printer *p); struct drm_printer *p);

22
drivers/gpu/drm/i915/intel_device_info.c
View File

@ -77,21 +77,19 @@ void intel_device_info_dump_flags(const struct intel_device_info *info,
#undef PRINT_FLAG #undef PRINT_FLAG
} }
void intel_device_info_dump(struct drm_i915_private *dev_priv) void intel_device_info_dump(const struct intel_device_info *info,
struct drm_printer *p)
{ {
const struct intel_device_info *info = &dev_priv->info; struct drm_i915_private *dev_priv =
container_of(info, struct drm_i915_private, info);
DRM_DEBUG_DRIVER("i915 device info: platform=%s gen=%i pciid=0x%04x rev=0x%02x", drm_printf(p, "pciid=0x%04x rev=0x%02x platform=%s gen=%i\n",
intel_platform_name(info->platform), INTEL_DEVID(dev_priv),
info->gen, INTEL_REVID(dev_priv),
dev_priv->drm.pdev->device, intel_platform_name(info->platform),
dev_priv->drm.pdev->revision); info->gen);
if (drm_debug & DRM_UT_DRIVER) { intel_device_info_dump_flags(info, p);
struct drm_printer p = drm_debug_printer("i915 device info: ");
intel_device_info_dump_flags(info, &p);
}
} }
static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)