projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
246bdbe
)
drm/i915: haswell has 3 pipes as well
author
Eugeni Dodonov
<eugeni.dodonov@intel.com>
Fri, 13 Apr 2012 20:08:45 +0000
(17:08 -0300)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 17 Apr 2012 10:13:08 +0000
(12:13 +0200)
They work differently, but the count is the same.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_dma.c
b/drivers/gpu/drm/i915/i915_dma.c
index 333b7468c8ecb5860fcfb2757353a22712eccf52..a813f652fa1f3a39e54a7426fb6a1f57772d9586 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_dma.c
+++ b/
drivers/gpu/drm/i915/i915_dma.c
@@
-2115,7
+2115,7
@@
int i915_driver_load(struct drm_device *dev, unsigned long flags)
spin_lock_init(&dev_priv->error_lock);
spin_lock_init(&dev_priv->rps_lock);
- if (IS_IVYBRIDGE(dev))
+ if (IS_IVYBRIDGE(dev)
|| IS_HASWELL(dev)
)
dev_priv->num_pipe = 3;
else if (IS_MOBILE(dev) || !IS_GEN2(dev))
dev_priv->num_pipe = 2;