From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com ([192.55.52.93]:44363 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbeCORsV (ORCPT ); Thu, 15 Mar 2018 13:48:21 -0400 Date: Thu, 15 Mar 2018 19:28:53 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Ulrich Hecht Cc: intel-gfx@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, laurent.pinchart@ideasonboard.com Subject: Re: [Intel-gfx] [PATCH igt 3/8] lib/igt_gt: has_gpu_reset(): fix failed assertion on non-i915 platforms Message-ID: <20180315172853.GW5453@intel.com> References: <1521125144-28614-1-git-send-email-ulrich.hecht+renesas@gmail.com> <1521125144-28614-4-git-send-email-ulrich.hecht+renesas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1521125144-28614-4-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: On Thu, Mar 15, 2018 at 03:45:39PM +0100, Ulrich Hecht wrote: > Checks if we have an i915 device before using intel_get_drm_devid(). > > Signed-off-by: Ulrich Hecht > --- > lib/igt_gt.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/lib/igt_gt.c b/lib/igt_gt.c > index e630550..9cb07c2 100644 > --- a/lib/igt_gt.c > +++ b/lib/igt_gt.c I would think igt_gt as a whole is pretty much i915 specific. So feels to me like we should not have gotten this deep when using another driver. > @@ -59,14 +59,17 @@ static bool has_gpu_reset(int fd) > struct drm_i915_getparam gp; > int val = 0; > > - memset(&gp, 0, sizeof(gp)); > - gp.param = 35; /* HAS_GPU_RESET */ > - gp.value = &val; > - > - if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) > - once = intel_gen(intel_get_drm_devid(fd)) >= 5; > - else > - once = val > 0; > + if (is_i915_device(fd)) { > + memset(&gp, 0, sizeof(gp)); > + gp.param = 35; /* HAS_GPU_RESET */ > + gp.value = &val; > + > + if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) > + once = intel_gen(intel_get_drm_devid(fd)) >= 5; > + else > + once = val > 0; > + } else > + once = 0; > } > return once; > } > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrj�l� Intel OTC From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH igt 3/8] lib/igt_gt: has_gpu_reset(): fix failed assertion on non-i915 platforms Date: Thu, 15 Mar 2018 19:28:53 +0200 Message-ID: <20180315172853.GW5453@intel.com> References: <1521125144-28614-1-git-send-email-ulrich.hecht+renesas@gmail.com> <1521125144-28614-4-git-send-email-ulrich.hecht+renesas@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 770756E1EC for ; Thu, 15 Mar 2018 17:28:57 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1521125144-28614-4-git-send-email-ulrich.hecht+renesas@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ulrich Hecht Cc: linux-renesas-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, laurent.pinchart@ideasonboard.com List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBNYXIgMTUsIDIwMTggYXQgMDM6NDU6MzlQTSArMDEwMCwgVWxyaWNoIEhlY2h0IHdy b3RlOgo+IENoZWNrcyBpZiB3ZSBoYXZlIGFuIGk5MTUgZGV2aWNlIGJlZm9yZSB1c2luZyBpbnRl bF9nZXRfZHJtX2RldmlkKCkuCj4gCj4gU2lnbmVkLW9mZi1ieTogVWxyaWNoIEhlY2h0IDx1bHJp Y2guaGVjaHQrcmVuZXNhc0BnbWFpbC5jb20+Cj4gLS0tCj4gIGxpYi9pZ3RfZ3QuYyB8IDE5ICsr KysrKysrKysrLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDgg ZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2xpYi9pZ3RfZ3QuYyBiL2xpYi9pZ3RfZ3Qu Ywo+IGluZGV4IGU2MzA1NTAuLjljYjA3YzIgMTAwNjQ0Cj4gLS0tIGEvbGliL2lndF9ndC5jCj4g KysrIGIvbGliL2lndF9ndC5jCgpJIHdvdWxkIHRoaW5rIGlndF9ndCBhcyBhIHdob2xlIGlzIHBy ZXR0eSBtdWNoIGk5MTUgc3BlY2lmaWMuClNvIGZlZWxzIHRvIG1lIGxpa2Ugd2Ugc2hvdWxkIG5v dCBoYXZlIGdvdHRlbiB0aGlzIGRlZXAgd2hlbgp1c2luZyBhbm90aGVyIGRyaXZlci4KCj4gQEAg LTU5LDE0ICs1OSwxNyBAQCBzdGF0aWMgYm9vbCBoYXNfZ3B1X3Jlc2V0KGludCBmZCkKPiAgCQlz dHJ1Y3QgZHJtX2k5MTVfZ2V0cGFyYW0gZ3A7Cj4gIAkJaW50IHZhbCA9IDA7Cj4gIAo+IC0JCW1l bXNldCgmZ3AsIDAsIHNpemVvZihncCkpOwo+IC0JCWdwLnBhcmFtID0gMzU7IC8qIEhBU19HUFVf UkVTRVQgKi8KPiAtCQlncC52YWx1ZSA9ICZ2YWw7Cj4gLQo+IC0JCWlmIChpb2N0bChmZCwgRFJN X0lPQ1RMX0k5MTVfR0VUUEFSQU0sICZncCkpCj4gLQkJCW9uY2UgPSBpbnRlbF9nZW4oaW50ZWxf Z2V0X2RybV9kZXZpZChmZCkpID49IDU7Cj4gLQkJZWxzZQo+IC0JCQlvbmNlID0gdmFsID4gMDsK PiArCQlpZiAoaXNfaTkxNV9kZXZpY2UoZmQpKSB7Cj4gKwkJCW1lbXNldCgmZ3AsIDAsIHNpemVv ZihncCkpOwo+ICsJCQlncC5wYXJhbSA9IDM1OyAvKiBIQVNfR1BVX1JFU0VUICovCj4gKwkJCWdw LnZhbHVlID0gJnZhbDsKPiArCj4gKwkJCWlmIChpb2N0bChmZCwgRFJNX0lPQ1RMX0k5MTVfR0VU UEFSQU0sICZncCkpCj4gKwkJCQlvbmNlID0gaW50ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQo ZmQpKSA+PSA1Owo+ICsJCQllbHNlCj4gKwkJCQlvbmNlID0gdmFsID4gMDsKPiArCQl9IGVsc2UK PiArCQkJb25jZSA9IDA7Cj4gIAl9Cj4gIAlyZXR1cm4gb25jZTsKPiAgfQo+IC0tIAo+IDIuNy40 Cj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJ bnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK