* [Intel-gfx] [PATCH] Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 18:11 ` Chris Wilson
0 siblings, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2019-11-21 18:11 UTC (permalink / raw)
To: intel-gfx
Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
("drm/i915: disable set/get_tiling ioctl on gen12+") before the ABI
change was agreed upon.
Fixes: ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
index 1fa592d82af5..39f3bd5defd6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
@@ -317,14 +317,10 @@ int
i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_file *file)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_i915_gem_set_tiling *args = data;
struct drm_i915_gem_object *obj;
int err;
- if (!dev_priv->ggtt.num_fences)
- return -EOPNOTSUPP;
-
obj = i915_gem_object_lookup(file, args->handle);
if (!obj)
return -ENOENT;
@@ -405,9 +401,6 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_object *obj;
int err = -ENOENT;
- if (!dev_priv->ggtt.num_fences)
- return -EOPNOTSUPP;
-
rcu_read_lock();
obj = i915_gem_object_lookup_rcu(file, args->handle);
if (obj) {
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 18:37 ` Vanshidhar Konda
0 siblings, 0 replies; 10+ messages in thread
From: Vanshidhar Konda @ 2019-11-21 18:37 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Nov 21, 2019 at 06:11:01PM +0000, Chris Wilson wrote:
>Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
>("drm/i915: disable set/get_tiling ioctl on gen12+") before the ABI
>change was agreed upon.
>
>Fixes: ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Vanshidhar Konda <vanshidhar.r.konda@intel.com>
>---
> drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 7 -------
> 1 file changed, 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>index 1fa592d82af5..39f3bd5defd6 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>@@ -317,14 +317,10 @@ int
> i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
>- struct drm_i915_private *dev_priv = to_i915(dev);
> struct drm_i915_gem_set_tiling *args = data;
> struct drm_i915_gem_object *obj;
> int err;
>
>- if (!dev_priv->ggtt.num_fences)
>- return -EOPNOTSUPP;
>-
> obj = i915_gem_object_lookup(file, args->handle);
> if (!obj)
> return -ENOENT;
>@@ -405,9 +401,6 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_i915_gem_object *obj;
> int err = -ENOENT;
>
>- if (!dev_priv->ggtt.num_fences)
>- return -EOPNOTSUPP;
>-
> rcu_read_lock();
> obj = i915_gem_object_lookup_rcu(file, args->handle);
> if (obj) {
>--
>2.24.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 18:37 ` Vanshidhar Konda
0 siblings, 0 replies; 10+ messages in thread
From: Vanshidhar Konda @ 2019-11-21 18:37 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Nov 21, 2019 at 06:11:01PM +0000, Chris Wilson wrote:
>Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
>("drm/i915: disable set/get_tiling ioctl on gen12+") before the ABI
>change was agreed upon.
>
>Fixes: ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Vanshidhar Konda <vanshidhar.r.konda@intel.com>
>---
> drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 7 -------
> 1 file changed, 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>index 1fa592d82af5..39f3bd5defd6 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>@@ -317,14 +317,10 @@ int
> i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
>- struct drm_i915_private *dev_priv = to_i915(dev);
> struct drm_i915_gem_set_tiling *args = data;
> struct drm_i915_gem_object *obj;
> int err;
>
>- if (!dev_priv->ggtt.num_fences)
>- return -EOPNOTSUPP;
>-
> obj = i915_gem_object_lookup(file, args->handle);
> if (!obj)
> return -ENOENT;
>@@ -405,9 +401,6 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_i915_gem_object *obj;
> int err = -ENOENT;
>
>- if (!dev_priv->ggtt.num_fences)
>- return -EOPNOTSUPP;
>-
> rcu_read_lock();
> obj = i915_gem_object_lookup_rcu(file, args->handle);
> if (obj) {
>--
>2.24.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 19:01 ` Patchwork
0 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-11-21 19:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
URL : https://patchwork.freedesktop.org/series/69845/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
881605b45eb1 Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
-:6: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")'
#6:
Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
total: 1 errors, 0 warnings, 0 checks, 23 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 19:19 ` Francisco Jerez
0 siblings, 0 replies; 10+ messages in thread
From: Francisco Jerez @ 2019-11-21 19:19 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
[-- Attachment #1.1.1: Type: text/plain, Size: 1913 bytes --]
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
> ("drm/i915: disable set/get_tiling ioctl on gen12+") before the ABI
> change was agreed upon.
>
> Fixes: ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thanks. This makes things easier for userspace until the
modifiers-based alternative to this is in better shape.
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> index 1fa592d82af5..39f3bd5defd6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> @@ -317,14 +317,10 @@ int
> i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
> - struct drm_i915_private *dev_priv = to_i915(dev);
> struct drm_i915_gem_set_tiling *args = data;
> struct drm_i915_gem_object *obj;
> int err;
>
> - if (!dev_priv->ggtt.num_fences)
> - return -EOPNOTSUPP;
> -
> obj = i915_gem_object_lookup(file, args->handle);
> if (!obj)
> return -ENOENT;
> @@ -405,9 +401,6 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_i915_gem_object *obj;
> int err = -ENOENT;
>
> - if (!dev_priv->ggtt.num_fences)
> - return -EOPNOTSUPP;
> -
> rcu_read_lock();
> obj = i915_gem_object_lookup_rcu(file, args->handle);
> if (obj) {
> --
> 2.24.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 19:19 ` Francisco Jerez
0 siblings, 0 replies; 10+ messages in thread
From: Francisco Jerez @ 2019-11-21 19:19 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
[-- Attachment #1.1.1: Type: text/plain, Size: 1913 bytes --]
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Restore the DRI2/DRI3 uABI backchannel that was removed by ab016914984e
> ("drm/i915: disable set/get_tiling ioctl on gen12+") before the ABI
> change was agreed upon.
>
> Fixes: ab016914984e ("drm/i915: disable set/get_tiling ioctl on gen12+")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thanks. This makes things easier for userspace until the
modifiers-based alternative to this is in better shape.
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> index 1fa592d82af5..39f3bd5defd6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> @@ -317,14 +317,10 @@ int
> i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
> - struct drm_i915_private *dev_priv = to_i915(dev);
> struct drm_i915_gem_set_tiling *args = data;
> struct drm_i915_gem_object *obj;
> int err;
>
> - if (!dev_priv->ggtt.num_fences)
> - return -EOPNOTSUPP;
> -
> obj = i915_gem_object_lookup(file, args->handle);
> if (!obj)
> return -ENOENT;
> @@ -405,9 +401,6 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> struct drm_i915_gem_object *obj;
> int err = -ENOENT;
>
> - if (!dev_priv->ggtt.num_fences)
> - return -EOPNOTSUPP;
> -
> rcu_read_lock();
> obj = i915_gem_object_lookup_rcu(file, args->handle);
> if (obj) {
> --
> 2.24.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.BAT: success for Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
@ 2019-11-21 19:22 ` Patchwork
0 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2019-11-21 19:22 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
URL : https://patchwork.freedesktop.org/series/69845/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7401 -> Patchwork_15382
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/index.html
Known issues
------------
Here are the changes found in Patchwork_15382 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic-flip-pipe-a:
- fi-icl-dsi: [PASS][1] -> [DMESG-WARN][2] ([fdo#106107])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-icl-dsi/igt@kms_busy@basic-flip-pipe-a.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-icl-dsi/igt@kms_busy@basic-flip-pipe-a.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-cml-s: [DMESG-WARN][3] ([fdo#111764]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-cml-s/igt@gem_exec_suspend@basic-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-cml-s/igt@gem_exec_suspend@basic-s3.html
* igt@i915_pm_rpm@module-reload:
- fi-skl-lmem: [DMESG-WARN][5] ([fdo#112261]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [DMESG-FAIL][7] ([fdo#112147]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-hsw-peppy/igt@i915_selftest@live_blt.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][9] ([fdo#102614]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [SKIP][11] ([fdo#109271]) -> [FAIL][12] ([fdo#110829])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7401/fi-kbl-guc/igt@i915_pm_rpm@basic-pci-d3-state.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/fi-kbl-guc/igt@i915_pm_rpm@basic-pci-d3-state.html
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#110829]: https://bugs.freedesktop.org/show_bug.cgi?id=110829
[fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764
[fdo#112147]: https://bugs.freedesktop.org/show_bug.cgi?id=112147
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (51 -> 43)
------------------------------
Missing (8): fi-hsw-4770r fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7401 -> Patchwork_15382
CI-20190529: 20190529
CI_DRM_7401: 242d04c5d3993e9f0cd025ac9a73a2e81d4206de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5299: 65fed6a79adea14f7bef6d55530da47d7731d370 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15382: 881605b45eb11c1bd408724cef13892f59fa122e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
881605b45eb1 Revert "drm/i915: disable set/get_tiling ioctl on gen12+"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15382/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread