diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 17:28:13 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-04-08 17:28:13 -0400 |
| commit | fd74ea65883c7e6903e9b652795f72b723a2be69 (patch) | |
| tree | 0792ad598080eae201d2836ac3c5a8fc46d0d03e /drivers/gpu/drm/i915/i915_dma.c | |
| parent | c8f517c444e4f9f55b5b5ca202b8404691a35805 (diff) | |
| parent | 8c6db1bbf80123839ec87bdd6cb364aea384623d (diff) | |
Merge branch 'dmaengine' into async-tx-raid6
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6dab63bdc4c1..6d21b9e48b89 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -1105,7 +1105,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 1105 | 1024 * 1024, | 1105 | 1024 * 1024, |
| 1106 | MTRR_TYPE_WRCOMB, 1); | 1106 | MTRR_TYPE_WRCOMB, 1); |
| 1107 | if (dev_priv->mm.gtt_mtrr < 0) { | 1107 | if (dev_priv->mm.gtt_mtrr < 0) { |
| 1108 | DRM_INFO("MTRR allocation failed\n. Graphics " | 1108 | DRM_INFO("MTRR allocation failed. Graphics " |
| 1109 | "performance may suffer.\n"); | 1109 | "performance may suffer.\n"); |
| 1110 | } | 1110 | } |
| 1111 | 1111 | ||