projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fbdev-cleanup' into drm-core-next
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_dma.c
diff --git
a/drivers/gpu/drm/i915/i915_dma.c
b/drivers/gpu/drm/i915/i915_dma.c
index
f0538da
..
52e468b
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_dma.c
+++ b/
drivers/gpu/drm/i915/i915_dma.c
@@
-1492,7
+1492,7
@@
static int i915_load_modeset_init(struct drm_device *dev,
I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
-
drm_helper_initial_config
(dev);
+
intel_fbdev_init
(dev);
return 0;