[intel] Quirk away MSI support on 945G/GM.

[platform/upstream/libdrm.git] / linux-core / xgi_fb.c

diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c
index 40f39fb..3f50fe8 100644 (file)
--- a/linux-core/xgi_fb.c
+++ b/linux-core/xgi_fb.c
@@ -32,7 +32,7 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
              struct drm_file * filp)
 {
        struct drm_memblock_item *block;
-       const char *const mem_name = (alloc->location == XGI_MEMLOC_LOCAL) 
+       const char *const mem_name = (alloc->location == XGI_MEMLOC_LOCAL)
                ? "on-card" : "GART";
 
 
@@ -43,7 +43,7 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
                return -EINVAL;
        }
 
-       if ((alloc->location == XGI_MEMLOC_LOCAL) 
+       if ((alloc->location == XGI_MEMLOC_LOCAL)
            ? !info->fb_heap_initialized : !info->pcie_heap_initialized) {
                DRM_ERROR("Attempt to allocate from uninitialized memory "
                          "pool (0x%08x).\n", alloc->location);
@@ -65,6 +65,13 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
                alloc->hw_addr = alloc->offset;
                alloc->index = block->user_hash.key;
 
+               if (block->user_hash.key != (unsigned long) alloc->index) {
+                       DRM_ERROR("%s truncated handle %lx for pool %d "
+                                 "offset %x\n",
+                                 __func__, block->user_hash.key,
+                                 alloc->location, alloc->offset);
+               }
+
                if (alloc->location == XGI_MEMLOC_NON_LOCAL) {
                        alloc->hw_addr += info->pcie.base;
                }
@@ -111,7 +118,7 @@ int xgi_free_ioctl(struct drm_device * dev, void * data,
 int xgi_fb_heap_init(struct xgi_info * info)
 {
        int err;
-       
+
        mutex_lock(&info->dev->struct_mutex);
        err = drm_sman_set_range(&info->sman, XGI_MEMLOC_LOCAL,
                                 XGI_FB_HEAP_START,