* [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr
@ 2016-09-30 17:31 Chris Wilson
2016-09-30 18:19 ` ✗ Fi.CI.BAT: warning for " Patchwork
2016-10-03 7:18 ` [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2016-09-30 17:31 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
We use obj->phys_handle to choose the pread/pwrite path, but as
obj->phys_handle is a union with obj->userptr, we then mistakenly use
the phys_handle path for userptr objects within pread/pwrite.
Testcase: igt/gem_userptr_blits/forbidden-operations
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97519
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/i915/i915_drv.h | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 91ff3d735c45..edb60a4aeb2e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2282,21 +2282,19 @@ struct drm_i915_gem_object {
/** Record of address bit 17 of each page at last unbind. */
unsigned long *bit_17;
- union {
- /** for phy allocated objects */
- struct drm_dma_handle *phys_handle;
-
- struct i915_gem_userptr {
- uintptr_t ptr;
- unsigned read_only :1;
- unsigned workers :4;
+ struct i915_gem_userptr {
+ uintptr_t ptr;
+ unsigned read_only :1;
+ unsigned workers :4;
#define I915_GEM_USERPTR_MAX_WORKERS 15
- struct i915_mm_struct *mm;
- struct i915_mmu_object *mmu_object;
- struct work_struct *work;
- } userptr;
- };
+ struct i915_mm_struct *mm;
+ struct i915_mmu_object *mmu_object;
+ struct work_struct *work;
+ } userptr;
+
+ /** for phys allocated objects */
+ struct drm_dma_handle *phys_handle;
};
static inline struct drm_i915_gem_object *
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* ✗ Fi.CI.BAT: warning for drm/i915: Unalias obj->phys_handle and obj->userptr
2016-09-30 17:31 [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr Chris Wilson
@ 2016-09-30 18:19 ` Patchwork
2016-10-03 7:18 ` [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-09-30 18:19 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Unalias obj->phys_handle and obj->userptr
URL : https://patchwork.freedesktop.org/series/13167/
State : warning
== Summary ==
Series 13167v1 drm/i915: Unalias obj->phys_handle and obj->userptr
https://patchwork.freedesktop.org/api/1.0/series/13167/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> SKIP (fi-skl-6770hq)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-j1900)
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42
fi-bxt-t5700 total:244 pass:214 dwarn:0 dfail:0 fail:0 skip:30
fi-byt-j1900 total:244 pass:211 dwarn:1 dfail:0 fail:1 skip:31
fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35
fi-hsw-4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-hsw-4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ilk-650 total:244 pass:182 dwarn:0 dfail:0 fail:2 skip:60
fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25
fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22
fi-skl-6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24
fi-skl-6770hq total:244 pass:227 dwarn:1 dfail:0 fail:1 skip:15
fi-snb-2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36
fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2607/
d0534bd0217c83c083ba146b9c987e19b219e0e4 drm-intel-nightly: 2016y-09m-30d-10h-31m-00s UTC integration manifest
117dea4 drm/i915: Unalias obj->phys_handle and obj->userptr
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr
2016-09-30 17:31 [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr Chris Wilson
2016-09-30 18:19 ` ✗ Fi.CI.BAT: warning for " Patchwork
@ 2016-10-03 7:18 ` Joonas Lahtinen
2016-10-13 13:11 ` Daniel Vetter
1 sibling, 1 reply; 4+ messages in thread
From: Joonas Lahtinen @ 2016-10-03 7:18 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On pe, 2016-09-30 at 18:31 +0100, Chris Wilson wrote:
> We use obj->phys_handle to choose the pread/pwrite path, but as
> obj->phys_handle is a union with obj->userptr, we then mistakenly use
> the phys_handle path for userptr objects within pread/pwrite.
>
> Testcase: igt/gem_userptr_blits/forbidden-operations
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97519
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr
2016-10-03 7:18 ` [PATCH] " Joonas Lahtinen
@ 2016-10-13 13:11 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2016-10-13 13:11 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: intel-gfx, stable
On Mon, Oct 03, 2016 at 10:18:03AM +0300, Joonas Lahtinen wrote:
> On pe, 2016-09-30 at 18:31 +0100, Chris Wilson wrote:
> > We use obj->phys_handle to choose the pread/pwrite path, but as
> > obj->phys_handle is a union with obj->userptr, we then mistakenly use
> > the phys_handle path for userptr objects within pread/pwrite.
> >
> > Testcase: igt/gem_userptr_blits/forbidden-operations
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97519
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: stable@vger.kernel.org
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Commmented already on irc, but I totally panicked about this one. I think
we need an ops->pwrite.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-13 13:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-30 17:31 [PATCH] drm/i915: Unalias obj->phys_handle and obj->userptr Chris Wilson
2016-09-30 18:19 ` ✗ Fi.CI.BAT: warning for " Patchwork
2016-10-03 7:18 ` [PATCH] " Joonas Lahtinen
2016-10-13 13:11 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox