[PATCH] drm/i915: Remember to set vma->pages for the preallocated stolen object

[PATCH] drm/i915: Remember to set vma->pages for the preallocated stolen object

[Chris Wilson]

In commit 247177ddd517 ("drm/i915: Always set the vma->pages"), as it
title implies, we always set vma->pages for bound objects. Even before
that, we would set vma->ggtt_view.pages, for globally bound objects.
This was forgotten for the fixup inside the preallocated stolen objects,
which has to recreate a global GTT binding outside of the usual VMA
insertion path

Fixes: 247177ddd517 ("drm/i915: Always set the vma->pages")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem_stolen.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 9a9b3cfbac7f..aa050fa1e558 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -716,6 +716,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
 		goto err;
 	}
 
+	vma->pages = obj->pages;
 	vma->flags |= I915_VMA_GLOBAL_BIND;
 	__i915_vma_set_map_and_fenceable(vma);
 	list_move_tail(&vma->vm_link, &ggtt->base.inactive_list);
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Remember to set vma->pages for the preallocated stolen object

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

Hi Chris,

[auto build test ERROR on next-20160817]
[cannot apply to drm-intel/for-linux-next v4.8-rc2 v4.8-rc1 v4.7-rc7 v4.8-rc2]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Chris-Wilson/drm-i915-Remember-to-set-vma-pages-for-the-preallocated-stolen-object/20160817-183701
config: x86_64-allyesconfig (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/gpu/drm/i915/i915_gem_stolen.c: In function 'i915_gem_object_create_stolen_for_preallocated':
>> drivers/gpu/drm/i915/i915_gem_stolen.c:708:5: error: 'struct i915_vma' has no member named 'pages'
     vma->pages = obj->pages;
        ^~

vim +708 drivers/gpu/drm/i915/i915_gem_stolen.c

   702		ret = drm_mm_reserve_node(&ggtt->base.mm, &vma->node);
   703		if (ret) {
   704			DRM_DEBUG_KMS("failed to allocate stolen GTT space\n");
   705			goto err;
   706		}
   707	
 > 708		vma->pages = obj->pages;
   709		vma->flags |= I915_VMA_GLOBAL_BIND;
   710		__i915_vma_set_map_and_fenceable(vma);
   711		list_move_tail(&vma->vm_link, &ggtt->base.inactive_list);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 54929 bytes --]

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Ro.CI.BAT: failure for drm/i915: Remember to set vma->pages for the preallocated stolen object

[Patchwork]

== Series Details ==

Series: drm/i915: Remember to set vma->pages for the preallocated stolen object
URL   : https://patchwork.freedesktop.org/series/11199/
State : failure

== Summary ==

Series 11199v1 drm/i915: Remember to set vma->pages for the preallocated stolen object
http://patchwork.freedesktop.org/api/1.0/series/11199/revisions/1/mbox

Test gem_exec_suspend:
        Subgroup basic-s3:
                dmesg-warn -> INCOMPLETE (fi-skl-i7-6700k)
Test kms_cursor_legacy:
        Subgroup basic-flip-vs-cursor-legacy:
                pass       -> FAIL       (ro-skl3-i5-6260u)
                pass       -> FAIL       (ro-bdw-i5-5250u)
        Subgroup basic-flip-vs-cursor-varying-size:
                pass       -> FAIL       (ro-byt-n2820)
                fail       -> PASS       (ro-bdw-i5-5250u)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (ro-bdw-i7-5600u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> SKIP       (fi-hsw-i7-4770k)
                dmesg-warn -> SKIP       (ro-bdw-i7-5557U)
                dmesg-warn -> SKIP       (ro-bdw-i5-5250u)
                dmesg-warn -> PASS       (ro-bdw-i7-5600u)

fi-hsw-i7-4770k  total:244  pass:221  dwarn:0   dfail:0   fail:0   skip:23 
fi-kbl-qkkr      total:244  pass:185  dwarn:29  dfail:0   fail:3   skip:27 
fi-skl-i7-6700k  total:107  pass:84   dwarn:0   dfail:0   fail:0   skip:22 
fi-snb-i7-2600   total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 
ro-bdw-i5-5250u  total:240  pass:219  dwarn:2   dfail:0   fail:1   skip:18 
ro-bdw-i7-5557U  total:240  pass:220  dwarn:2   dfail:0   fail:0   skip:18 
ro-bdw-i7-5600u  total:240  pass:206  dwarn:0   dfail:0   fail:2   skip:32 
ro-bsw-n3050     total:240  pass:195  dwarn:0   dfail:0   fail:3   skip:42 
ro-byt-n2820     total:240  pass:198  dwarn:0   dfail:0   fail:2   skip:40 
ro-hsw-i3-4010u  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
ro-hsw-i7-4770r  total:240  pass:185  dwarn:0   dfail:0   fail:0   skip:55 
ro-ilk1-i5-650   total:235  pass:174  dwarn:0   dfail:0   fail:1   skip:60 
ro-ivb-i7-3770   total:240  pass:205  dwarn:0   dfail:0   fail:0   skip:35 
ro-ivb2-i7-3770  total:240  pass:209  dwarn:0   dfail:0   fail:0   skip:31 
ro-skl3-i5-6260u total:240  pass:222  dwarn:0   dfail:0   fail:4   skip:14 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1899/

690c6b2 drm-intel-nightly: 2016y-08m-17d-10h-30m-13s UTC integration manifest
2e7293a drm/i915: Remember to set vma->pages for the preallocated stolen object

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Remember to set vma->pages for the preallocated stolen object

[Joonas Lahtinen]

On ke, 2016-08-17 at 11:33 +0100, Chris Wilson wrote:
> In commit 247177ddd517 ("drm/i915: Always set the vma->pages"), as it
> title implies, we always set vma->pages for bound objects. Even before
> that, we would set vma->ggtt_view.pages, for globally bound objects.
> This was forgotten for the fixup inside the preallocated stolen objects,
> which has to recreate a global GTT binding outside of the usual VMA
> insertion path
> 
> Fixes: 247177ddd517 ("drm/i915: Always set the vma->pages")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx