diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-12-29 12:50:25 +1000 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-30 18:09:26 +0800 |
| commit | 1b897abd6c8500dc6dcaac548ab7d531f37522c8 (patch) | |
| tree | 1dea71f803fda8f023aa55d8abc9691200cd95ac /src | |
| parent | f0e9e54c96ac58cab9ea9d6b83739c84d1ae13d7 (diff) | |
intel/kms: disable overlay when it needs physical address
We can't do phy address allocations, need kernel support for this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit b710a688a7383df320f9d4e765b48331310a4d1d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_memory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index ca159649..2053d06b 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1074,8 +1074,11 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) if (OVERLAY_NOEXIST(pI830)) return TRUE; - if (!OVERLAY_NOPHYSICAL(pI830)) + if (!OVERLAY_NOPHYSICAL(pI830)) { + if (pI830->use_drm_mode) + return TRUE; flags |= NEED_PHYSICAL_ADDR; + } pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers", OVERLAY_SIZE, GTT_PAGE_SIZE, |