* [PATCH 1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
@ 2023-01-25 15:50 ` Christian König
0 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 15:50 UTC (permalink / raw)
To: matthew.william.auld, dri-devel, intel-gfx; +Cc: Christian König
This reverts commit 4110872b8115aab2adb3a52149c144d8465440de.
This still seems to break i915.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_util.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 17330fb4480a..fca8b0e0e30a 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -704,23 +704,30 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup);
*/
int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
{
+ static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
struct ttm_buffer_object *ghost;
+ struct ttm_resource *sys_res;
struct ttm_tt *ttm;
int ret;
+ ret = ttm_resource_alloc(bo, &sys_mem, &sys_res);
+ if (ret)
+ return ret;
+
/* If already idle, no need for ghost object dance. */
if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) {
if (!bo->ttm) {
/* See comment below about clearing. */
ret = ttm_tt_create(bo, true);
if (ret)
- return ret;
+ goto error_free_sys_mem;
} else {
ttm_tt_unpopulate(bo->bdev, bo->ttm);
if (bo->type == ttm_bo_type_device)
ttm_tt_mark_for_clear(bo->ttm);
}
ttm_resource_free(bo, &bo->resource);
+ ttm_bo_assign_mem(bo, sys_res);
return 0;
}
@@ -737,7 +744,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
ret = ttm_tt_create(bo, true);
swap(bo->ttm, ttm);
if (ret)
- return ret;
+ goto error_free_sys_mem;
ret = ttm_buffer_object_transfer(bo, &ghost);
if (ret)
@@ -753,9 +760,13 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
dma_resv_unlock(&ghost->base._resv);
ttm_bo_put(ghost);
bo->ttm = ttm;
+ ttm_bo_assign_mem(bo, sys_res);
return 0;
error_destroy_tt:
ttm_tt_destroy(bo->bdev, ttm);
+
+error_free_sys_mem:
+ ttm_resource_free(bo, &sys_res);
return ret;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
@ 2023-01-25 15:50 ` Christian König
0 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 15:50 UTC (permalink / raw)
To: matthew.william.auld, dri-devel, intel-gfx; +Cc: Christian König
This reverts commit 4110872b8115aab2adb3a52149c144d8465440de.
This still seems to break i915.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_util.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 17330fb4480a..fca8b0e0e30a 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -704,23 +704,30 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup);
*/
int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
{
+ static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
struct ttm_buffer_object *ghost;
+ struct ttm_resource *sys_res;
struct ttm_tt *ttm;
int ret;
+ ret = ttm_resource_alloc(bo, &sys_mem, &sys_res);
+ if (ret)
+ return ret;
+
/* If already idle, no need for ghost object dance. */
if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) {
if (!bo->ttm) {
/* See comment below about clearing. */
ret = ttm_tt_create(bo, true);
if (ret)
- return ret;
+ goto error_free_sys_mem;
} else {
ttm_tt_unpopulate(bo->bdev, bo->ttm);
if (bo->type == ttm_bo_type_device)
ttm_tt_mark_for_clear(bo->ttm);
}
ttm_resource_free(bo, &bo->resource);
+ ttm_bo_assign_mem(bo, sys_res);
return 0;
}
@@ -737,7 +744,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
ret = ttm_tt_create(bo, true);
swap(bo->ttm, ttm);
if (ret)
- return ret;
+ goto error_free_sys_mem;
ret = ttm_buffer_object_transfer(bo, &ghost);
if (ret)
@@ -753,9 +760,13 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
dma_resv_unlock(&ghost->base._resv);
ttm_bo_put(ghost);
bo->ttm = ttm;
+ ttm_bo_assign_mem(bo, sys_res);
return 0;
error_destroy_tt:
ttm_tt_destroy(bo->bdev, ttm);
+
+error_free_sys_mem:
+ ttm_resource_free(bo, &sys_res);
return ret;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
2023-01-25 15:50 ` [Intel-gfx] " Christian König
@ 2023-01-25 15:50 ` Christian König
-1 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 15:50 UTC (permalink / raw)
To: matthew.william.auld, dri-devel, intel-gfx; +Cc: Christian König
This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
It seems to still breka i915.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 33471e363ff4..9baccb2f6e99 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
struct sg_table *sg, struct dma_resv *resv,
void (*destroy) (struct ttm_buffer_object *))
{
+ static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
int ret;
kref_init(&bo->kref);
@@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
bo->base.resv = &bo->base._resv;
atomic_inc(&ttm_glob.bo_count);
+ ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
+ if (unlikely(ret)) {
+ ttm_bo_put(bo);
+ return ret;
+ }
+
/*
* For ttm_bo_type_device buffers, allocate
* address space from the device.
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
@ 2023-01-25 15:50 ` Christian König
0 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 15:50 UTC (permalink / raw)
To: matthew.william.auld, dri-devel, intel-gfx; +Cc: Christian König
This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
It seems to still breka i915.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 33471e363ff4..9baccb2f6e99 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
struct sg_table *sg, struct dma_resv *resv,
void (*destroy) (struct ttm_buffer_object *))
{
+ static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
int ret;
kref_init(&bo->kref);
@@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
bo->base.resv = &bo->base._resv;
atomic_inc(&ttm_glob.bo_count);
+ ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
+ if (unlikely(ret)) {
+ ttm_bo_put(bo);
+ return ret;
+ }
+
/*
* For ttm_bo_type_device buffers, allocate
* address space from the device.
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
2023-01-25 15:50 ` [Intel-gfx] " Christian König
@ 2023-01-25 16:13 ` Matthew Auld
-1 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-25 16:13 UTC (permalink / raw)
To: Christian König; +Cc: intel-gfx, Christian König, dri-devel
On Wed, 25 Jan 2023 at 15:50, Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
>
> It seems to still breka i915.
We also need to revert the third patch:
b49323aa35d5 drm/ttm: prevent moving of pinned BOs
It introduces the side effect of no longer calling tt_create(true) in
ttm_bo_validate(), and I'm 99% sure that will break object clearing.
We rely on having a ttm_tt for the initial dummy placement, with
FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
have the dummy move, like with this patch.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 33471e363ff4..9baccb2f6e99 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> struct sg_table *sg, struct dma_resv *resv,
> void (*destroy) (struct ttm_buffer_object *))
> {
> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> int ret;
>
> kref_init(&bo->kref);
> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> bo->base.resv = &bo->base._resv;
> atomic_inc(&ttm_glob.bo_count);
>
> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> + if (unlikely(ret)) {
> + ttm_bo_put(bo);
> + return ret;
> + }
> +
> /*
> * For ttm_bo_type_device buffers, allocate
> * address space from the device.
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
@ 2023-01-25 16:13 ` Matthew Auld
0 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-25 16:13 UTC (permalink / raw)
To: Christian König; +Cc: intel-gfx, Christian König, dri-devel
On Wed, 25 Jan 2023 at 15:50, Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
>
> It seems to still breka i915.
We also need to revert the third patch:
b49323aa35d5 drm/ttm: prevent moving of pinned BOs
It introduces the side effect of no longer calling tt_create(true) in
ttm_bo_validate(), and I'm 99% sure that will break object clearing.
We rely on having a ttm_tt for the initial dummy placement, with
FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
have the dummy move, like with this patch.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 33471e363ff4..9baccb2f6e99 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> struct sg_table *sg, struct dma_resv *resv,
> void (*destroy) (struct ttm_buffer_object *))
> {
> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> int ret;
>
> kref_init(&bo->kref);
> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> bo->base.resv = &bo->base._resv;
> atomic_inc(&ttm_glob.bo_count);
>
> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> + if (unlikely(ret)) {
> + ttm_bo_put(bo);
> + return ret;
> + }
> +
> /*
> * For ttm_bo_type_device buffers, allocate
> * address space from the device.
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
2023-01-25 16:13 ` [Intel-gfx] " Matthew Auld
@ 2023-01-25 16:15 ` Christian König
-1 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 16:15 UTC (permalink / raw)
To: Matthew Auld, Christian König; +Cc: intel-gfx, dri-devel
Am 25.01.23 um 17:13 schrieb Matthew Auld:
> On Wed, 25 Jan 2023 at 15:50, Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
>>
>> It seems to still breka i915.
> We also need to revert the third patch:
>
> b49323aa35d5 drm/ttm: prevent moving of pinned BOs
>
> It introduces the side effect of no longer calling tt_create(true) in
> ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> We rely on having a ttm_tt for the initial dummy placement, with
> FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> have the dummy move, like with this patch.
Oh, yes of course. Can I add your Acked-by to reverting all three?
Thanks,
Christian.
>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index 33471e363ff4..9baccb2f6e99 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
>> struct sg_table *sg, struct dma_resv *resv,
>> void (*destroy) (struct ttm_buffer_object *))
>> {
>> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
>> int ret;
>>
>> kref_init(&bo->kref);
>> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
>> bo->base.resv = &bo->base._resv;
>> atomic_inc(&ttm_glob.bo_count);
>>
>> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
>> + if (unlikely(ret)) {
>> + ttm_bo_put(bo);
>> + return ret;
>> + }
>> +
>> /*
>> * For ttm_bo_type_device buffers, allocate
>> * address space from the device.
>> --
>> 2.34.1
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
@ 2023-01-25 16:15 ` Christian König
0 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2023-01-25 16:15 UTC (permalink / raw)
To: Matthew Auld, Christian König; +Cc: intel-gfx, dri-devel
Am 25.01.23 um 17:13 schrieb Matthew Auld:
> On Wed, 25 Jan 2023 at 15:50, Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
>>
>> It seems to still breka i915.
> We also need to revert the third patch:
>
> b49323aa35d5 drm/ttm: prevent moving of pinned BOs
>
> It introduces the side effect of no longer calling tt_create(true) in
> ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> We rely on having a ttm_tt for the initial dummy placement, with
> FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> have the dummy move, like with this patch.
Oh, yes of course. Can I add your Acked-by to reverting all three?
Thanks,
Christian.
>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index 33471e363ff4..9baccb2f6e99 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
>> struct sg_table *sg, struct dma_resv *resv,
>> void (*destroy) (struct ttm_buffer_object *))
>> {
>> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
>> int ret;
>>
>> kref_init(&bo->kref);
>> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
>> bo->base.resv = &bo->base._resv;
>> atomic_inc(&ttm_glob.bo_count);
>>
>> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
>> + if (unlikely(ret)) {
>> + ttm_bo_put(bo);
>> + return ret;
>> + }
>> +
>> /*
>> * For ttm_bo_type_device buffers, allocate
>> * address space from the device.
>> --
>> 2.34.1
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
2023-01-25 16:15 ` Christian König
@ 2023-01-25 16:24 ` Matthew Auld
-1 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-25 16:24 UTC (permalink / raw)
To: Christian König; +Cc: Christian König, intel-gfx, dri-devel
On Wed, 25 Jan 2023 at 16:15, Christian König <christian.koenig@amd.com> wrote:
>
> Am 25.01.23 um 17:13 schrieb Matthew Auld:
> > On Wed, 25 Jan 2023 at 15:50, Christian König
> > <ckoenig.leichtzumerken@gmail.com> wrote:
> >> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
> >>
> >> It seems to still breka i915.
> > We also need to revert the third patch:
> >
> > b49323aa35d5 drm/ttm: prevent moving of pinned BOs
> >
> > It introduces the side effect of no longer calling tt_create(true) in
> > ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> > We rely on having a ttm_tt for the initial dummy placement, with
> > FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> > creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> > have the dummy move, like with this patch.
>
> Oh, yes of course. Can I add your Acked-by to reverting all three?
Yeah, feel free to add. I can then resend your series with the extra
stuff we need for i915.
>
> Thanks,
> Christian.
>
> >
> >> Signed-off-by: Christian König <christian.koenig@amd.com>
> >> ---
> >> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> >> 1 file changed, 7 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> >> index 33471e363ff4..9baccb2f6e99 100644
> >> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> >> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> >> struct sg_table *sg, struct dma_resv *resv,
> >> void (*destroy) (struct ttm_buffer_object *))
> >> {
> >> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> >> int ret;
> >>
> >> kref_init(&bo->kref);
> >> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> >> bo->base.resv = &bo->base._resv;
> >> atomic_inc(&ttm_glob.bo_count);
> >>
> >> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> >> + if (unlikely(ret)) {
> >> + ttm_bo_put(bo);
> >> + return ret;
> >> + }
> >> +
> >> /*
> >> * For ttm_bo_type_device buffers, allocate
> >> * address space from the device.
> >> --
> >> 2.34.1
> >>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
@ 2023-01-25 16:24 ` Matthew Auld
0 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-25 16:24 UTC (permalink / raw)
To: Christian König; +Cc: Christian König, intel-gfx, dri-devel
On Wed, 25 Jan 2023 at 16:15, Christian König <christian.koenig@amd.com> wrote:
>
> Am 25.01.23 um 17:13 schrieb Matthew Auld:
> > On Wed, 25 Jan 2023 at 15:50, Christian König
> > <ckoenig.leichtzumerken@gmail.com> wrote:
> >> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
> >>
> >> It seems to still breka i915.
> > We also need to revert the third patch:
> >
> > b49323aa35d5 drm/ttm: prevent moving of pinned BOs
> >
> > It introduces the side effect of no longer calling tt_create(true) in
> > ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> > We rely on having a ttm_tt for the initial dummy placement, with
> > FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> > creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> > have the dummy move, like with this patch.
>
> Oh, yes of course. Can I add your Acked-by to reverting all three?
Yeah, feel free to add. I can then resend your series with the extra
stuff we need for i915.
>
> Thanks,
> Christian.
>
> >
> >> Signed-off-by: Christian König <christian.koenig@amd.com>
> >> ---
> >> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> >> 1 file changed, 7 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> >> index 33471e363ff4..9baccb2f6e99 100644
> >> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> >> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> >> struct sg_table *sg, struct dma_resv *resv,
> >> void (*destroy) (struct ttm_buffer_object *))
> >> {
> >> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> >> int ret;
> >>
> >> kref_init(&bo->kref);
> >> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> >> bo->base.resv = &bo->base._resv;
> >> atomic_inc(&ttm_glob.bo_count);
> >>
> >> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> >> + if (unlikely(ret)) {
> >> + ttm_bo_put(bo);
> >> + return ret;
> >> + }
> >> +
> >> /*
> >> * For ttm_bo_type_device buffers, allocate
> >> * address space from the device.
> >> --
> >> 2.34.1
> >>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
2023-01-25 15:50 ` [Intel-gfx] " Christian König
(?)
(?)
@ 2023-01-26 1:01 ` Patchwork
-1 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-26 1:01 UTC (permalink / raw)
To: Christian König; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
URL : https://patchwork.freedesktop.org/series/113345/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
2023-01-25 15:50 ` [Intel-gfx] " Christian König
` (2 preceding siblings ...)
(?)
@ 2023-01-26 1:22 ` Patchwork
-1 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-26 1:22 UTC (permalink / raw)
To: Christian König; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5631 bytes --]
== Series Details ==
Series: series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
URL : https://patchwork.freedesktop.org/series/113345/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12640 -> Patchwork_113345v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/index.html
Participating hosts (37 -> 38)
------------------------------
Additional (1): fi-bsw-kefka
Known issues
------------
Here are the changes found in Patchwork_113345v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-bsw-nick: NOTRUN -> [SKIP][1] ([fdo#109271]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-bsw-nick/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-d-hdmi-a-2:
- bat-dg1-6: [PASS][2] -> [FAIL][3] ([fdo#103375]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/bat-dg1-6/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-d-hdmi-a-2.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/bat-dg1-6/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-d-hdmi-a-2.html
* igt@prime_vgem@basic-fence-flip:
- fi-bsw-kefka: NOTRUN -> [SKIP][4] ([fdo#109271]) +26 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-bsw-kefka/igt@prime_vgem@basic-fence-flip.html
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [FAIL][5] ([i915#7229]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adlp-9}: [DMESG-WARN][7] -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/bat-adlp-9/igt@gem_exec_suspend@basic-s0@smem.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/bat-adlp-9/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][9] ([i915#7911]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@migrate:
- {bat-dg2-11}: [DMESG-WARN][11] ([i915#7699]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/bat-dg2-11/igt@i915_selftest@live@migrate.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/bat-dg2-11/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@slpc:
- {bat-rpls-1}: [DMESG-FAIL][13] ([i915#6367]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/bat-rpls-1/igt@i915_selftest@live@slpc.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@kms_cursor_legacy@basic-flip-after-cursor@atomic-transitions-varying-size:
- fi-bsw-n3050: [FAIL][15] ([i915#2346]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/fi-bsw-n3050/igt@kms_cursor_legacy@basic-flip-after-cursor@atomic-transitions-varying-size.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-bsw-n3050/igt@kms_cursor_legacy@basic-flip-after-cursor@atomic-transitions-varying-size.html
#### Warnings ####
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [FAIL][17] ([fdo#103375]) -> [INCOMPLETE][18] ([i915#4817])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
Build changes
-------------
* Linux: CI_DRM_12640 -> Patchwork_113345v1
CI-20190529: 20190529
CI_DRM_12640: cc7783f223ac644092bb8788f0750fc5c68aa00e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7136: 31b6af91747ad8c705399c9006cdb81cb1864146 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113345v1: cc7783f223ac644092bb8788f0750fc5c68aa00e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/index.html
[-- Attachment #2: Type: text/html, Size: 6421 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
2023-01-25 15:50 ` [Intel-gfx] " Christian König
` (3 preceding siblings ...)
(?)
@ 2023-01-26 11:32 ` Patchwork
-1 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-26 11:32 UTC (permalink / raw)
To: Christian König; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 20459 bytes --]
== Series Details ==
Series: series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting"
URL : https://patchwork.freedesktop.org/series/113345/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12640_full -> Patchwork_113345v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/index.html
Participating hosts (12 -> 11)
------------------------------
Additional (1): shard-rkl0
Missing (2): pig-skl-6260u pig-kbl-iris
Known issues
------------
Here are the changes found in Patchwork_113345v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#7513])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-glk1/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2346])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#79])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-glk7/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-glk2/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
#### Possible fixes ####
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][7] ([i915#6268]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-2/igt@gem_ctx_exec@basic-nohangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_eio@suspend:
- {shard-rkl}: [FAIL][9] ([i915#7052]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@gem_eio@suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-1/igt@gem_eio@suspend.html
* igt@gem_exec_reloc@basic-write-gtt-active:
- {shard-rkl}: [SKIP][11] ([i915#3281]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-4/igt@gem_exec_reloc@basic-write-gtt-active.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-5/igt@gem_exec_reloc@basic-write-gtt-active.html
* igt@gem_partial_pwrite_pread@reads:
- {shard-rkl}: [SKIP][13] ([i915#3282]) -> [PASS][14] +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-4/igt@gem_partial_pwrite_pread@reads.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-5/igt@gem_partial_pwrite_pread@reads.html
* igt@gen9_exec_parse@bb-start-param:
- {shard-rkl}: [SKIP][15] ([i915#2527]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-6/igt@gen9_exec_parse@bb-start-param.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-5/igt@gen9_exec_parse@bb-start-param.html
* igt@i915_hangman@gt-engine-error@bcs0:
- {shard-rkl}: [SKIP][17] ([i915#6258]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-5/igt@i915_hangman@gt-engine-error@bcs0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-2/igt@i915_hangman@gt-engine-error@bcs0.html
* igt@i915_module_load@reload-no-display:
- {shard-tglu}: [DMESG-WARN][19] -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-tglu-8/igt@i915_module_load@reload-no-display.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-tglu-7/igt@i915_module_load@reload-no-display.html
* igt@i915_pipe_stress@stress-xrgb8888-untiled:
- {shard-rkl}: [SKIP][21] ([i915#4098]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-2/igt@i915_pipe_stress@stress-xrgb8888-untiled.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@i915_pipe_stress@stress-xrgb8888-untiled.html
* igt@i915_pm_dc@dc6-psr:
- {shard-rkl}: [SKIP][23] ([i915#658]) -> [PASS][24] +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-1/igt@i915_pm_dc@dc6-psr.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_rpm@i2c:
- {shard-rkl}: [SKIP][25] ([fdo#109308]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@i915_pm_rpm@i2c.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@i915_pm_rpm@i2c.html
* igt@i915_pm_rpm@modeset-lpsp-stress-no-wait:
- {shard-rkl}: [SKIP][27] ([i915#1397]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-2/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- {shard-rkl}: [SKIP][29] ([i915#1845] / [i915#4098]) -> [PASS][30] +29 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-2/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- {shard-rkl}: [SKIP][31] ([i915#1849] / [i915#4098]) -> [PASS][32] +21 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_plane@plane-panning-top-left@pipe-a-planes:
- {shard-rkl}: [SKIP][33] ([i915#1849]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@kms_plane@plane-panning-top-left@pipe-a-planes.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_plane@plane-panning-top-left@pipe-a-planes.html
* igt@kms_psr@sprite_plane_onoff:
- {shard-rkl}: [SKIP][35] ([i915#1072]) -> [PASS][36] +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@kms_psr@sprite_plane_onoff.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- {shard-rkl}: [SKIP][37] ([i915#5461]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
* igt@kms_universal_plane@cursor-fb-leak-pipe-b:
- {shard-rkl}: [SKIP][39] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-2/igt@kms_universal_plane@cursor-fb-leak-pipe-b.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@kms_universal_plane@cursor-fb-leak-pipe-b.html
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][41] ([i915#4349]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-6/igt@perf_pmu@idle@rcs0.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-5/igt@perf_pmu@idle@rcs0.html
* igt@prime_vgem@basic-fence-flip:
- {shard-rkl}: [SKIP][43] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12640/shard-rkl-3/igt@prime_vgem@basic-fence-flip.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2232]: https://gitlab.freedesktop.org/drm/intel/issues/2232
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3536]: https://gitlab.freedesktop.org/drm/intel/issues/3536
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6403]: https://gitlab.freedesktop.org/drm/intel/issues/6403
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7513]: https://gitlab.freedesktop.org/drm/intel/issues/7513
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
Build changes
-------------
* Linux: CI_DRM_12640 -> Patchwork_113345v1
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12640: cc7783f223ac644092bb8788f0750fc5c68aa00e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7136: 31b6af91747ad8c705399c9006cdb81cb1864146 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113345v1: cc7783f223ac644092bb8788f0750fc5c68aa00e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113345v1/index.html
[-- Attachment #2: Type: text/html, Size: 12659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
2023-01-25 16:24 ` [Intel-gfx] " Matthew Auld
@ 2023-01-31 9:32 ` Matthew Auld
-1 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-31 9:32 UTC (permalink / raw)
To: Christian König; +Cc: Christian König, intel-gfx, dri-devel
On Wed, 25 Jan 2023 at 16:24, Matthew Auld
<matthew.william.auld@gmail.com> wrote:
>
> On Wed, 25 Jan 2023 at 16:15, Christian König <christian.koenig@amd.com> wrote:
> >
> > Am 25.01.23 um 17:13 schrieb Matthew Auld:
> > > On Wed, 25 Jan 2023 at 15:50, Christian König
> > > <ckoenig.leichtzumerken@gmail.com> wrote:
> > >> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
> > >>
> > >> It seems to still breka i915.
> > > We also need to revert the third patch:
> > >
> > > b49323aa35d5 drm/ttm: prevent moving of pinned BOs
> > >
> > > It introduces the side effect of no longer calling tt_create(true) in
> > > ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> > > We rely on having a ttm_tt for the initial dummy placement, with
> > > FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> > > creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> > > have the dummy move, like with this patch.
> >
> > Oh, yes of course. Can I add your Acked-by to reverting all three?
>
> Yeah, feel free to add. I can then resend your series with the extra
> stuff we need for i915.
https://patchwork.freedesktop.org/series/113484/
CI appears to be happy now. Feel free to merge the series.
>
> >
> > Thanks,
> > Christian.
> >
> > >
> > >> Signed-off-by: Christian König <christian.koenig@amd.com>
> > >> ---
> > >> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> > >> 1 file changed, 7 insertions(+)
> > >>
> > >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> > >> index 33471e363ff4..9baccb2f6e99 100644
> > >> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> > >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> > >> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> > >> struct sg_table *sg, struct dma_resv *resv,
> > >> void (*destroy) (struct ttm_buffer_object *))
> > >> {
> > >> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> > >> int ret;
> > >>
> > >> kref_init(&bo->kref);
> > >> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> > >> bo->base.resv = &bo->base._resv;
> > >> atomic_inc(&ttm_glob.bo_count);
> > >>
> > >> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> > >> + if (unlikely(ret)) {
> > >> + ttm_bo_put(bo);
> > >> + return ret;
> > >> + }
> > >> +
> > >> /*
> > >> * For ttm_bo_type_device buffers, allocate
> > >> * address space from the device.
> > >> --
> > >> 2.34.1
> > >>
> >
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation"
@ 2023-01-31 9:32 ` Matthew Auld
0 siblings, 0 replies; 15+ messages in thread
From: Matthew Auld @ 2023-01-31 9:32 UTC (permalink / raw)
To: Christian König; +Cc: Christian König, intel-gfx, dri-devel
On Wed, 25 Jan 2023 at 16:24, Matthew Auld
<matthew.william.auld@gmail.com> wrote:
>
> On Wed, 25 Jan 2023 at 16:15, Christian König <christian.koenig@amd.com> wrote:
> >
> > Am 25.01.23 um 17:13 schrieb Matthew Auld:
> > > On Wed, 25 Jan 2023 at 15:50, Christian König
> > > <ckoenig.leichtzumerken@gmail.com> wrote:
> > >> This reverts commit 00984ad39599bb2a1e6ec5d4e9c75a749f7f45c9.
> > >>
> > >> It seems to still breka i915.
> > > We also need to revert the third patch:
> > >
> > > b49323aa35d5 drm/ttm: prevent moving of pinned BOs
> > >
> > > It introduces the side effect of no longer calling tt_create(true) in
> > > ttm_bo_validate(), and I'm 99% sure that will break object clearing.
> > > We rely on having a ttm_tt for the initial dummy placement, with
> > > FLAG_ZERO_ALLOC set if clear is needed. Also I'm not sure who even
> > > creates the ttm_tt now, if ttm_bo_validate() doesn't, and we don't
> > > have the dummy move, like with this patch.
> >
> > Oh, yes of course. Can I add your Acked-by to reverting all three?
>
> Yeah, feel free to add. I can then resend your series with the extra
> stuff we need for i915.
https://patchwork.freedesktop.org/series/113484/
CI appears to be happy now. Feel free to merge the series.
>
> >
> > Thanks,
> > Christian.
> >
> > >
> > >> Signed-off-by: Christian König <christian.koenig@amd.com>
> > >> ---
> > >> drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++++
> > >> 1 file changed, 7 insertions(+)
> > >>
> > >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> > >> index 33471e363ff4..9baccb2f6e99 100644
> > >> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> > >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> > >> @@ -957,6 +957,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> > >> struct sg_table *sg, struct dma_resv *resv,
> > >> void (*destroy) (struct ttm_buffer_object *))
> > >> {
> > >> + static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
> > >> int ret;
> > >>
> > >> kref_init(&bo->kref);
> > >> @@ -973,6 +974,12 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, struct ttm_buffer_object *bo,
> > >> bo->base.resv = &bo->base._resv;
> > >> atomic_inc(&ttm_glob.bo_count);
> > >>
> > >> + ret = ttm_resource_alloc(bo, &sys_mem, &bo->resource);
> > >> + if (unlikely(ret)) {
> > >> + ttm_bo_put(bo);
> > >> + return ret;
> > >> + }
> > >> +
> > >> /*
> > >> * For ttm_bo_type_device buffers, allocate
> > >> * address space from the device.
> > >> --
> > >> 2.34.1
> > >>
> >
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-01-31 9:33 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-25 15:50 [PATCH 1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting" Christian König
2023-01-25 15:50 ` [Intel-gfx] " Christian König
2023-01-25 15:50 ` [PATCH 2/2] drm/ttm: revert "stop allocating dummy resources during BO creation" Christian König
2023-01-25 15:50 ` [Intel-gfx] " Christian König
2023-01-25 16:13 ` Matthew Auld
2023-01-25 16:13 ` [Intel-gfx] " Matthew Auld
2023-01-25 16:15 ` Christian König
2023-01-25 16:15 ` Christian König
2023-01-25 16:24 ` Matthew Auld
2023-01-25 16:24 ` [Intel-gfx] " Matthew Auld
2023-01-31 9:32 ` Matthew Auld
2023-01-31 9:32 ` [Intel-gfx] " Matthew Auld
2023-01-26 1:01 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/ttm: revert "stop allocating a dummy resource for pipelined gutting" Patchwork
2023-01-26 1:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-26 11:32 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.