diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-06-17 12:39:28 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-17 12:39:28 -0700 |
| commit | 1cfe769c74d1a3a392bf1aaaf5c2dcc8273daf66 (patch) | |
| tree | 5feb1735ce740b8d8160a509f60fb455e1625de4 /src/i830_memory.c | |
| parent | 289790c0467d27e96b537598a6589fc6a36da8b8 (diff) | |
Add support for Intel 4 series chipsets.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index 6f7d7cc0..6e7a838f 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -447,7 +447,7 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) /* Overlay and cursors, if physical, need to be allocated outside * of the kernel memory manager. */ - if (!OVERLAY_NOPHYSICAL(pI830) && !IS_IGD_GM(pI830)) { + if (!OVERLAY_NOPHYSICAL(pI830) && !OVERLAY_NOEXIST(pI830)) { mmsize -= ROUND_TO(OVERLAY_SIZE, GTT_PAGE_SIZE); } if (pI830->CursorNeedsPhysical) { @@ -459,7 +459,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) /* Can't do TTM on stolen memory */ mmsize -= pI830->stolen_size; - if (HWS_NEED_GFX(pI830) && IS_IGD_GM(pI830)) + /* new chipsets need non-stolen status page */ + if (HWS_NEED_GFX(pI830) && HWS_NEED_NONSTOLEN(pI830)) mmsize -= HWSTATUS_PAGE_SIZE; /* Create the aperture allocation */ @@ -1027,7 +1028,7 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) if (!pI830->XvEnabled) return TRUE; - if (IS_IGD_GM(pI830)) + if (OVERLAY_NOEXIST(pI830)) return TRUE; if (!OVERLAY_NOPHYSICAL(pI830)) @@ -1646,7 +1647,7 @@ i830_allocate_hwstatus(ScrnInfoPtr pScrn) * (i.e. not through buffer objects). */ flags = NEED_LIFETIME_FIXED; - if (IS_IGD_GM(pI830)) + if (HWS_NEED_NONSTOLEN(pI830)) flags |= NEED_NON_STOLEN; pI830->hw_status = i830_allocate_memory(pScrn, "HW status", HWSTATUS_PAGE_SIZE, GTT_PAGE_SIZE, flags); |