* [PATCH] drm/i915/userptr: Convert to drm_i915_private
@ 2016-05-19 15:17 Chris Wilson
2016-05-19 15:29 ` Tvrtko Ursulin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2016-05-19 15:17 UTC (permalink / raw)
To: intel-gfx
userptr directly only uses drm_device in a single interface where it
meant to use drm_i915_private (everywhere else we have to derive it from
the drm_i915_gem_object and so require going from drm_device).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 5 +----
drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +---
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 72f0b02a8372..b89817178874 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2966,7 +2966,7 @@ int i915_gem_set_tiling(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_get_tiling(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int i915_gem_init_userptr(struct drm_device *dev);
+void i915_gem_init_userptr(struct drm_i915_private *dev_priv);
int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 24cab8802c2e..6a31445a0471 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4913,10 +4913,7 @@ int i915_gem_init(struct drm_device *dev)
*/
intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
- ret = i915_gem_init_userptr(dev);
- if (ret)
- goto out_unlock;
-
+ i915_gem_init_userptr(dev_priv);
i915_gem_init_ggtt(dev);
ret = i915_gem_context_init(dev);
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 32d9726e38b1..380d15cf7ff0 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -855,10 +855,8 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file
return 0;
}
-int
-i915_gem_init_userptr(struct drm_device *dev)
+void i915_gem_init_userptr(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
mutex_init(&dev_priv->mm_lock);
hash_init(dev_priv->mm_structs);
return 0;
--
2.8.1
_______________________________________________
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* Re: [PATCH] drm/i915/userptr: Convert to drm_i915_private
2016-05-19 15:17 [PATCH] drm/i915/userptr: Convert to drm_i915_private Chris Wilson
@ 2016-05-19 15:29 ` Tvrtko Ursulin
2016-05-19 15:46 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-05-23 10:17 ` [PATCH] " Joonas Lahtinen
2 siblings, 0 replies; 4+ messages in thread
From: Tvrtko Ursulin @ 2016-05-19 15:29 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 19/05/16 16:17, Chris Wilson wrote:
> userptr directly only uses drm_device in a single interface where it
> meant to use drm_i915_private (everywhere else we have to derive it from
> the drm_i915_gem_object and so require going from drm_device).
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_gem.c | 5 +----
> drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +---
> 3 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 72f0b02a8372..b89817178874 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2966,7 +2966,7 @@ int i915_gem_set_tiling(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> int i915_gem_get_tiling(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> -int i915_gem_init_userptr(struct drm_device *dev);
> +void i915_gem_init_userptr(struct drm_i915_private *dev_priv);
> int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file);
> int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 24cab8802c2e..6a31445a0471 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4913,10 +4913,7 @@ int i915_gem_init(struct drm_device *dev)
> */
> intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
>
> - ret = i915_gem_init_userptr(dev);
> - if (ret)
> - goto out_unlock;
> -
> + i915_gem_init_userptr(dev_priv);
> i915_gem_init_ggtt(dev);
>
> ret = i915_gem_context_init(dev);
> diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
> index 32d9726e38b1..380d15cf7ff0 100644
> --- a/drivers/gpu/drm/i915/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
> @@ -855,10 +855,8 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file
> return 0;
> }
>
> -int
> -i915_gem_init_userptr(struct drm_device *dev)
> +void i915_gem_init_userptr(struct drm_i915_private *dev_priv)
> {
> - struct drm_i915_private *dev_priv = to_i915(dev);
> mutex_init(&dev_priv->mm_lock);
> hash_init(dev_priv->mm_structs);
> return 0;
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
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* ✗ Ro.CI.BAT: failure for drm/i915/userptr: Convert to drm_i915_private
2016-05-19 15:17 [PATCH] drm/i915/userptr: Convert to drm_i915_private Chris Wilson
2016-05-19 15:29 ` Tvrtko Ursulin
@ 2016-05-19 15:46 ` Patchwork
2016-05-23 10:17 ` [PATCH] " Joonas Lahtinen
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-05-19 15:46 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/userptr: Convert to drm_i915_private
URL : https://patchwork.freedesktop.org/series/7413/
State : failure
== Summary ==
Series 7413v1 drm/i915/userptr: Convert to drm_i915_private
http://patchwork.freedesktop.org/api/1.0/series/7413/revisions/1/mbox
Test drv_module_reload_basic:
dmesg-warn -> PASS (fi-hsw-i7-4770r)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-cmd:
pass -> FAIL (fi-byt-n2820)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (ro-byt-n2820)
Test kms_sink_crc_basic:
skip -> PASS (ro-skl-i7-6700hq)
fi-bdw-i7-5557u total:219 pass:206 dwarn:0 dfail:0 fail:0 skip:13
fi-byt-n2820 total:218 pass:174 dwarn:0 dfail:0 fail:3 skip:41
fi-hsw-i7-4770k total:219 pass:198 dwarn:0 dfail:0 fail:0 skip:21
fi-hsw-i7-4770r total:219 pass:193 dwarn:0 dfail:0 fail:0 skip:26
fi-skl-i7-6700k total:219 pass:191 dwarn:0 dfail:0 fail:0 skip:28
ro-bdw-i5-5250u total:217 pass:179 dwarn:0 dfail:0 fail:0 skip:38
ro-bdw-i7-5557U total:217 pass:204 dwarn:0 dfail:0 fail:0 skip:13
ro-bdw-i7-5600u total:217 pass:184 dwarn:0 dfail:0 fail:1 skip:32
ro-bsw-n3050 total:217 pass:173 dwarn:0 dfail:0 fail:2 skip:42
ro-byt-n2820 total:216 pass:172 dwarn:0 dfail:0 fail:3 skip:41
ro-hsw-i3-4010u total:216 pass:191 dwarn:0 dfail:0 fail:0 skip:25
ro-hsw-i7-4770r total:217 pass:191 dwarn:0 dfail:0 fail:0 skip:26
ro-ilk-i7-620lm total:217 pass:149 dwarn:0 dfail:0 fail:1 skip:67
ro-ivb-i7-3770 total:217 pass:181 dwarn:0 dfail:0 fail:0 skip:36
ro-ivb2-i7-3770 total:217 pass:185 dwarn:0 dfail:0 fail:0 skip:32
ro-skl-i7-6700hq total:212 pass:188 dwarn:0 dfail:0 fail:0 skip:24
ro-snb-i7-2620M total:217 pass:175 dwarn:0 dfail:0 fail:1 skip:41
fi-bsw-n3050 failed to connect after reboot
fi-snb-i7-2600 failed to connect after reboot
ro-ilk1-i5-650 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_942/
521c3f7 drm-intel-nightly: 2016y-05m-19d-13h-07m-04s UTC integration manifest
2fbdf6c drm/i915/userptr: Convert to drm_i915_private
_______________________________________________
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/userptr: Convert to drm_i915_private
2016-05-19 15:17 [PATCH] drm/i915/userptr: Convert to drm_i915_private Chris Wilson
2016-05-19 15:29 ` Tvrtko Ursulin
2016-05-19 15:46 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-05-23 10:17 ` Joonas Lahtinen
2 siblings, 0 replies; 4+ messages in thread
From: Joonas Lahtinen @ 2016-05-23 10:17 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On to, 2016-05-19 at 16:17 +0100, Chris Wilson wrote:
> -int
> -i915_gem_init_userptr(struct drm_device *dev)
> +void i915_gem_init_userptr(struct drm_i915_private *dev_priv)
> {
> - struct drm_i915_private *dev_priv = to_i915(dev);
> mutex_init(&dev_priv->mm_lock);
> hash_init(dev_priv->mm_structs);
> return 0;
You should remove the "return 0;" if you make the function void, and
maybe also make a not int he commit message.
With that,
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
end of thread, other threads:[~2016-05-23 10:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-19 15:17 [PATCH] drm/i915/userptr: Convert to drm_i915_private Chris Wilson
2016-05-19 15:29 ` Tvrtko Ursulin
2016-05-19 15:46 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-05-23 10:17 ` [PATCH] " Joonas Lahtinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox