[PATCH] drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[PATCH] drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[Chris Wilson]

The physical object is treated as permanently pinned. If we fail to take
this initial pin during i915_gem_object_attach_phys() we need to revert
it back to an ordinary shmemfs object before reporting the failure.

Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 71297920fdf4..290b141e0ae6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -586,9 +586,18 @@ i915_gem_object_attach_phys(struct drm_i915_gem_object *obj,
 	if (obj->mm.pages)
 		return -EBUSY;
 
+	GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
 	obj->ops = &i915_gem_phys_ops;
 
-	return i915_gem_object_pin_pages(obj);
+	ret = i915_gem_object_pin_pages(obj);
+	if (ret)
+		goto err_xfer;
+
+	return 0;
+
+err_xfer:
+	obj->ops = &i915_gem_object_ops;
+	return ret;
 }
 
 static int
-- 
2.11.0

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

✗ Fi.CI.BAT: failure for drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[Patchwork]

== Series Details ==

Series: drm/i915: Unwind conversion to i915_gem_phys_ops on failure
URL   : https://patchwork.freedesktop.org/series/19708/
State : failure

== Summary ==

  LD      drivers/video/fbdev/built-in.o
  LD      drivers/usb/gadget/libcomposite.o
  LD      drivers/spi/built-in.o
  LD      drivers/pci/pcie/aer/aerdriver.o
  LD      drivers/pci/pcie/aer/built-in.o
  LD      drivers/pci/pcie/built-in.o
In file included from ./include/uapi/linux/stddef.h:1:0,
                 from ./include/linux/stddef.h:4,
                 from ./include/uapi/linux/posix_types.h:4,
                 from ./include/uapi/linux/types.h:13,
                 from ./include/linux/types.h:5,
                 from ./include/linux/list.h:4,
                 from ./include/linux/agp_backend.h:33,
                 from ./include/drm/drmP.h:35,
                 from drivers/gpu/drm/i915/i915_gem.c:28:
drivers/gpu/drm/i915/i915_gem.c: In function ‘i915_gem_object_attach_phys’:
drivers/gpu/drm/i915/i915_gem.c:589:26: error: ‘i915_gem_object_ops’ undeclared (first use in this function)
  GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
                          ^
./include/linux/compiler.h:168:42: note: in definition of macro ‘unlikely’
 # define unlikely(x) __builtin_expect(!!(x), 0)
                                          ^
drivers/gpu/drm/i915/i915_gem.h:29:26: note: in expansion of macro ‘BUG_ON’
 #define GEM_BUG_ON(expr) BUG_ON(expr)
                          ^
drivers/gpu/drm/i915/i915_gem.c:589:2: note: in expansion of macro ‘GEM_BUG_ON’
  GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
  ^
drivers/gpu/drm/i915/i915_gem.c:589:26: note: each undeclared identifier is reported only once for each function it appears in
  GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
                          ^
./include/linux/compiler.h:168:42: note: in definition of macro ‘unlikely’
 # define unlikely(x) __builtin_expect(!!(x), 0)
                                          ^
drivers/gpu/drm/i915/i915_gem.h:29:26: note: in expansion of macro ‘BUG_ON’
 #define GEM_BUG_ON(expr) BUG_ON(expr)
                          ^
drivers/gpu/drm/i915/i915_gem.c:589:2: note: in expansion of macro ‘GEM_BUG_ON’
  GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
  ^
  LD      drivers/tty/serial/8250/8250.o
  LD      drivers/video/console/built-in.o
  LD [M]  drivers/net/ethernet/broadcom/genet/genet.o
  LD      drivers/video/built-in.o
  LD [M]  sound/pci/hda/snd-hda-codec-generic.o
  AR      lib/lib.a
  LD      sound/pci/built-in.o
  EXPORTS lib/lib-ksyms.o
  LD      lib/built-in.o
  LD      drivers/pci/built-in.o
scripts/Makefile.build:294: recipe for target 'drivers/gpu/drm/i915/i915_gem.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_gem.o] Error 1
make[4]: *** Waiting for unfinished jobs....
  LD      sound/built-in.o
  LD      net/xfrm/built-in.o
  LD      drivers/scsi/sd_mod.o
  LD      drivers/scsi/built-in.o
  LD      drivers/usb/gadget/udc/udc-core.o
  LD      net/ipv6/ipv6.o
  LD      drivers/usb/gadget/udc/built-in.o
  LD      drivers/usb/gadget/built-in.o
  LD      drivers/tty/serial/8250/8250_base.o
  LD      drivers/tty/serial/8250/built-in.o
  LD [M]  drivers/net/ethernet/intel/igbvf/igbvf.o
  LD      net/ipv6/built-in.o
  LD      drivers/tty/serial/built-in.o
  LD      fs/btrfs/btrfs.o
  LD      drivers/usb/host/xhci-hcd.o
  LD [M]  drivers/net/ethernet/intel/e1000/e1000.o
  LD      fs/btrfs/built-in.o
  LD      drivers/usb/core/usbcore.o
  LD      drivers/usb/core/built-in.o
  LD      drivers/tty/vt/built-in.o
  LD      drivers/tty/built-in.o
  LD      drivers/md/md-mod.o
  LD      drivers/md/built-in.o
  CC      arch/x86/kernel/cpu/capflags.o
  LD      arch/x86/kernel/cpu/built-in.o
  LD      arch/x86/kernel/built-in.o
  LD      arch/x86/built-in.o
  LD      fs/ext4/ext4.o
  LD      fs/ext4/built-in.o
  LD      fs/built-in.o
  LD      net/ipv4/built-in.o
  LD      net/core/built-in.o
  LD      net/built-in.o
  LD      drivers/usb/host/built-in.o
  LD      drivers/usb/built-in.o
  LD [M]  drivers/net/ethernet/intel/igb/igb.o
  LD [M]  drivers/net/ethernet/intel/e1000e/e1000e.o
  LD      drivers/net/ethernet/built-in.o
  LD      drivers/net/built-in.o
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:553: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:988: recipe for target 'drivers' failed
make: *** [drivers] Error 2

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

[PATCH v2] drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[Chris Wilson]

The physical object is treated as permanently pinned. If we fail to take
this initial pin during i915_gem_object_attach_phys() we need to revert
it back to an ordinary shmemfs object before reporting the failure.

v2: git-add

Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 71297920fdf4..dc799db0446c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -313,6 +313,8 @@ static const struct drm_i915_gem_object_ops i915_gem_phys_ops = {
 	.release = i915_gem_object_release_phys,
 };
 
+static const struct drm_i915_gem_object_ops i915_gem_object_ops;
+
 int i915_gem_object_unbind(struct drm_i915_gem_object *obj)
 {
 	struct i915_vma *vma;
@@ -586,9 +588,18 @@ i915_gem_object_attach_phys(struct drm_i915_gem_object *obj,
 	if (obj->mm.pages)
 		return -EBUSY;
 
+	GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
 	obj->ops = &i915_gem_phys_ops;
 
-	return i915_gem_object_pin_pages(obj);
+	ret = i915_gem_object_pin_pages(obj);
+	if (ret)
+		goto err_xfer;
+
+	return 0;
+
+err_xfer:
+	obj->ops = &i915_gem_object_ops;
+	return ret;
 }
 
 static int
-- 
2.11.0

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

✗ Fi.CI.BAT: failure for drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)
URL   : https://patchwork.freedesktop.org/series/19708/
State : failure

== Summary ==

Series 19708v2 drm/i915: Unwind conversion to i915_gem_phys_ops on failure
https://patchwork.freedesktop.org/api/1.0/series/19708/revisions/2/mbox/

Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-b-frame-sequence:
                pass       -> DMESG-FAIL (fi-snb-2520m)
        Subgroup read-crc-pipe-a:
                pass       -> DMESG-FAIL (fi-snb-2520m)
        Subgroup read-crc-pipe-a-frame-sequence:
                pass       -> DMESG-FAIL (fi-snb-2520m)
        Subgroup read-crc-pipe-b:
                pass       -> DMESG-FAIL (fi-snb-2520m)
        Subgroup read-crc-pipe-b-frame-sequence:
                pass       -> INCOMPLETE (fi-snb-2520m)

fi-bdw-5557u     total:252  pass:238  dwarn:3   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:252  pass:210  dwarn:3   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:252  pass:230  dwarn:3   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:83   pass:70   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:252  pass:222  dwarn:3   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:252  pass:218  dwarn:3   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:252  pass:233  dwarn:3   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:252  pass:233  dwarn:3   dfail:0   fail:0   skip:16 
fi-ilk-650       total:252  pass:199  dwarn:3   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:252  pass:231  dwarn:3   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:252  pass:231  dwarn:3   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:252  pass:231  dwarn:3   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:252  pass:239  dwarn:3   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:252  pass:232  dwarn:3   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:252  pass:230  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:252  pass:239  dwarn:3   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:206  pass:180  dwarn:0   dfail:4   fail:0   skip:21 
fi-snb-2600      total:252  pass:220  dwarn:3   dfail:0   fail:0   skip:29 

890e171e84eb11944701de9d53c1162dd5c38142 drm-tip: 2017y-02m-15d-15h-34m-13s UTC integration manifest
2cd2668 drm/i915: Unwind conversion to i915_gem_phys_ops on failure

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3831/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[kbuild test robot]

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

Hi Chris,

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.10-rc8 next-20170215]
[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-Unwind-conversion-to-i915_gem_phys_ops-on-failure/20170215-225207
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-b0-02160137 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

   In file included from include/uapi/linux/stddef.h:1:0,
                    from include/linux/stddef.h:4,
                    from include/uapi/linux/posix_types.h:4,
                    from include/uapi/linux/types.h:13,
                    from include/linux/types.h:5,
                    from include/linux/list.h:4,
                    from include/linux/agp_backend.h:33,
                    from include/drm/drmP.h:35,
                    from drivers/gpu/drm/i915/i915_gem.c:28:
   drivers/gpu/drm/i915/i915_gem.c: In function 'i915_gem_object_attach_phys':
   drivers/gpu/drm/i915/i915_gem.c:588:26: error: 'i915_gem_object_ops' undeclared (first use in this function)
     GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
                             ^
   include/linux/compiler.h:168:42: note: in definition of macro 'unlikely'
    # define unlikely(x) __builtin_expect(!!(x), 0)
                                             ^
>> drivers/gpu/drm/i915/i915_gem.h:29:26: note: in expansion of macro 'BUG_ON'
    #define GEM_BUG_ON(expr) BUG_ON(expr)
                             ^~~~~~
   drivers/gpu/drm/i915/i915_gem.c:588:2: note: in expansion of macro 'GEM_BUG_ON'
     GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
     ^~~~~~~~~~
   drivers/gpu/drm/i915/i915_gem.c:588:26: note: each undeclared identifier is reported only once for each function it appears in
     GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
                             ^
   include/linux/compiler.h:168:42: note: in definition of macro 'unlikely'
    # define unlikely(x) __builtin_expect(!!(x), 0)
                                             ^
>> drivers/gpu/drm/i915/i915_gem.h:29:26: note: in expansion of macro 'BUG_ON'
    #define GEM_BUG_ON(expr) BUG_ON(expr)
                             ^~~~~~
   drivers/gpu/drm/i915/i915_gem.c:588:2: note: in expansion of macro 'GEM_BUG_ON'
     GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
     ^~~~~~~~~~

vim +/BUG_ON +29 drivers/gpu/drm/i915/i915_gem.h

d501b1d2b Chris Wilson 2016-04-13  13   * Software.
d501b1d2b Chris Wilson 2016-04-13  14   *
d501b1d2b Chris Wilson 2016-04-13  15   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
d501b1d2b Chris Wilson 2016-04-13  16   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
d501b1d2b Chris Wilson 2016-04-13  17   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
d501b1d2b Chris Wilson 2016-04-13  18   * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
d501b1d2b Chris Wilson 2016-04-13  19   * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
d501b1d2b Chris Wilson 2016-04-13  20   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
d501b1d2b Chris Wilson 2016-04-13  21   * IN THE SOFTWARE.
d501b1d2b Chris Wilson 2016-04-13  22   *
d501b1d2b Chris Wilson 2016-04-13  23   */
d501b1d2b Chris Wilson 2016-04-13  24  
d501b1d2b Chris Wilson 2016-04-13  25  #ifndef __I915_GEM_H__
d501b1d2b Chris Wilson 2016-04-13  26  #define __I915_GEM_H__
d501b1d2b Chris Wilson 2016-04-13  27  
d501b1d2b Chris Wilson 2016-04-13  28  #ifdef CONFIG_DRM_I915_DEBUG_GEM
d501b1d2b Chris Wilson 2016-04-13 @29  #define GEM_BUG_ON(expr) BUG_ON(expr)
17cfde60a Matthew Auld 2016-12-13  30  #define GEM_WARN_ON(expr) WARN_ON(expr)
d501b1d2b Chris Wilson 2016-04-13  31  #else
4cfa20c83 Matthew Auld 2016-12-02  32  #define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
17cfde60a Matthew Auld 2016-12-13  33  #define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0)
d501b1d2b Chris Wilson 2016-04-13  34  #endif
d501b1d2b Chris Wilson 2016-04-13  35  
73cb97010 Chris Wilson 2016-10-28  36  #define I915_NUM_ENGINES 5
73cb97010 Chris Wilson 2016-10-28  37  

:::::: The code at line 29 was first introduced by commit
:::::: d501b1d2b19d87f216510fcf12b1b56b3c4545ef drm/i915: Add GEM debugging Kconfig option

:::::: TO: Chris Wilson <chris@chris-wilson.co.uk>
:::::: CC: Chris Wilson <chris@chris-wilson.co.uk>

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

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 26050 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

✗ Fi.CI.BAT: failure for drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)
URL   : https://patchwork.freedesktop.org/series/19708/
State : failure

== Summary ==

Series 19708v2 drm/i915: Unwind conversion to i915_gem_phys_ops on failure
https://patchwork.freedesktop.org/api/1.0/series/19708/revisions/2/mbox/

Test gem_wait:
        Subgroup basic-wait-all:
                pass       -> FAIL       (fi-ilk-650)

fi-bdw-5557u     total:252  pass:241  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:252  pass:213  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:252  pass:233  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:83   pass:70   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:252  pass:225  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:252  pass:221  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:252  pass:236  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:252  pass:236  dwarn:0   dfail:0   fail:0   skip:16 
fi-ilk-650       total:252  pass:201  dwarn:0   dfail:0   fail:1   skip:50 
fi-ivb-3520m     total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:252  pass:242  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:252  pass:235  dwarn:0   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:252  pass:230  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:252  pass:242  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:252  pass:224  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:252  pass:223  dwarn:0   dfail:0   fail:0   skip:29 

89a932d98b6e1733011019c9872583a9c7c8fda3 drm-tip: 2017y-02m-16d-10h-06m-42s UTC integration manifest
c6de395 drm/i915: Unwind conversion to i915_gem_phys_ops on failure

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3844/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915: Unwind conversion to i915_gem_phys_ops on failure

[Mika Kuoppala]

Chris Wilson <chris@chris-wilson.co.uk> writes:

> The physical object is treated as permanently pinned. If we fail to take
> this initial pin during i915_gem_object_attach_phys() we need to revert
> it back to an ordinary shmemfs object before reporting the failure.
>
> v2: git-add
>
> Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 71297920fdf4..dc799db0446c 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -313,6 +313,8 @@ static const struct drm_i915_gem_object_ops i915_gem_phys_ops = {
>  	.release = i915_gem_object_release_phys,
>  };
>  
> +static const struct drm_i915_gem_object_ops i915_gem_object_ops;
> +
>  int i915_gem_object_unbind(struct drm_i915_gem_object *obj)
>  {
>  	struct i915_vma *vma;
> @@ -586,9 +588,18 @@ i915_gem_object_attach_phys(struct drm_i915_gem_object *obj,
>  	if (obj->mm.pages)
>  		return -EBUSY;
>  
> +	GEM_BUG_ON(obj->ops != &i915_gem_object_ops);
>  	obj->ops = &i915_gem_phys_ops;
>  
> -	return i915_gem_object_pin_pages(obj);
> +	ret = i915_gem_object_pin_pages(obj);
> +	if (ret)
> +		goto err_xfer;
> +
> +	return 0;
> +
> +err_xfer:
> +	obj->ops = &i915_gem_object_ops;
> +	return ret;
>  }
>  
>  static int
> -- 
> 2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Unwind conversion to i915_gem_phys_ops on failure (rev2)
URL   : https://patchwork.freedesktop.org/series/19708/
State : failure

== Summary ==

Series 19708v2 drm/i915: Unwind conversion to i915_gem_phys_ops on failure
https://patchwork.freedesktop.org/api/1.0/series/19708/revisions/2/mbox/

Test drv_module_reload:
        Subgroup basic-no-display:
                pass       -> INCOMPLETE (fi-hsw-4770r)

fi-bdw-5557u     total:252  pass:241  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:252  pass:213  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:252  pass:233  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:83   pass:70   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:252  pass:225  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:252  pass:221  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:252  pass:236  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:249  pass:233  dwarn:0   dfail:0   fail:0   skip:15 
fi-ilk-650       total:252  pass:202  dwarn:0   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:252  pass:234  dwarn:0   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:252  pass:242  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:252  pass:235  dwarn:0   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:252  pass:230  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:252  pass:242  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:252  pass:224  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:252  pass:223  dwarn:0   dfail:0   fail:0   skip:29 

89a932d98b6e1733011019c9872583a9c7c8fda3 drm-tip: 2017y-02m-16d-10h-06m-42s UTC integration manifest
445b36b drm/i915: Unwind conversion to i915_gem_phys_ops on failure

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3854/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx