Rev 2342 | Rev 2352 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2342 | Rev 2351 | ||
|---|---|---|---|
| Line 32... | Line 32... | ||
| 32 | #include "drm_fb_helper.h" |
32 | #include "drm_fb_helper.h" |
| 33 | #include "intel_drv.h" |
33 | #include "intel_drv.h" |
| 34 | #include "i915_drm.h" |
34 | #include "i915_drm.h" |
| 35 | #include "i915_drv.h" |
35 | #include "i915_drv.h" |
| 36 | #include |
36 | #include |
| 37 | //#include "i915_trace.h" |
37 | #include "i915_trace.h" |
| 38 | //#include "../../../platform/x86/intel_ips.h" |
38 | //#include "../../../platform/x86/intel_ips.h" |
| 39 | #include |
39 | #include |
| 40 | //#include |
40 | //#include |
| 41 | //#include |
41 | //#include |
| 42 | //#include |
42 | //#include |
| Line 239... | Line 239... | ||
| 239 | if (ret) |
239 | if (ret) |
| 240 | goto cleanup_vga_switcheroo; |
240 | goto cleanup_vga_switcheroo; |
| Line 241... | Line 241... | ||
| 241 | 241 | ||
| Line 242... | Line 242... | ||
| 242 | intel_modeset_gem_init(dev); |
242 | intel_modeset_gem_init(dev); |
| 243 | 243 | ||
| 244 | // ret = drm_irq_install(dev); |
244 | ret = drm_irq_install(dev); |
| Line 245... | Line 245... | ||
| 245 | // if (ret) |
245 | if (ret) |
| 246 | // goto cleanup_gem; |
246 | goto cleanup_gem; |
| 247 | 247 | ||
| Line 519... | Line 519... | ||
| 519 | // } |
519 | // } |
| Line 520... | Line 520... | ||
| 520 | 520 | ||
| 521 | /* enable GEM by default */ |
521 | /* enable GEM by default */ |
| Line 522... | Line -... | ||
| 522 | dev_priv->has_gem = 1; |
- | |
| 523 | 522 | dev_priv->has_gem = 1; |
|
| Line 524... | Line 523... | ||
| 524 | 523 | ||
| 525 | // intel_irq_init(dev); |
524 | intel_irq_init(dev); |
| 526 | 525 | ||
| 527 | /* Try to make sure MCHBAR is enabled before poking at it */ |
526 | /* Try to make sure MCHBAR is enabled before poking at it */ |