From patchwork Wed Sep 26 14:50:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10616063 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 478A815E8 for ; Wed, 26 Sep 2018 14:50:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30FC52B1C9 for ; Wed, 26 Sep 2018 14:50:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 253F52B1D6; Wed, 26 Sep 2018 14:50:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8BB22B1C9 for ; Wed, 26 Sep 2018 14:50:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B6D688E53; Wed, 26 Sep 2018 14:50:42 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 507E188E53 for ; Wed, 26 Sep 2018 14:50:40 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id z16-v6so2692177wmi.3 for ; Wed, 26 Sep 2018 07:50:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SW6cuuHDNulbVLo1GK6dzr6vUHfmMhG6wkKQK/osmJE=; b=oyas3rKFwwgOyQepW4oFm+rdUIWC2r24sepDjq0OQd45rUO/Ugvve7GRSXaFJat8DS f/SU9T1maSZ1r7D8zisrNtH1gg4eTlMhUAc5xuHWH1lLVIgJFXmlW9Fj64wtPwPFmkqp 4mepTFZiIh9HvE/phUwZZKG6bqa0WULwE92BSmynQT8wwJqernCEWVkat1dnaSU39wsm AMkUIN3O8mQqM/RKdbGSOtqNy17HLEAyBInkIessxlLSLFk0YA+Fn7OXCxH0hS7I7D9a RQVEtOjPy4F7oBXNQ30f1ERrt/jK2Yu7lhDyW8S0TPiDH5MnB2i+qBe0NKrsKYIN0ww2 YkPw== X-Gm-Message-State: ABuFfogRyzUOSLgtIwlziA4fJduh7pTmqXyJ2NEigIiJgt9YgCm0DjSF rsujjSf/LWgiFUHlDQJ01RkSAJqnqtk= X-Google-Smtp-Source: ACcGV62eDwa1pSyuRiL1ZPe9NLnMltxcxpayp9rxvP76ajAHAreQSaFBSpRY3Dg4xIMeYLdCl614jg== X-Received: by 2002:a1c:b4d:: with SMTP id 74-v6mr4382989wml.15.1537973438725; Wed, 26 Sep 2018 07:50:38 -0700 (PDT) Received: from localhost.localdomain ([95.144.165.37]) by smtp.gmail.com with ESMTPSA id h18-v6sm420379wrb.82.2018.09.26.07.50.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 07:50:38 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 26 Sep 2018 15:50:33 +0100 Message-Id: <20180926145033.16318-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <153796063158.22836.18296824848059760839@skylake-alporthouse-com> References: <153796063158.22836.18296824848059760839@skylake-alporthouse-com> Subject: [Intel-gfx] [PATCH v2] drm/i915: Log HWS seqno consistently X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin We mix hexa- and decimal which is confusing when reading the logs. So make the single odd one out instance decimal for consistency. v2: * Do the intel_ringbuffer.c as well. (Chris Wilson) Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 4b28225320ff..ad93aa4b0a6e 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1904,7 +1904,7 @@ static void execlists_reset(struct intel_engine_cs *engine, unsigned long flags; u32 *regs; - GEM_TRACE("%s request global=%x, current=%d\n", + GEM_TRACE("%s request global=%d, current=%d\n", engine->name, request ? request->global_seqno : 0, intel_engine_get_seqno(engine)); diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index d0ef50bf930a..c092d5099ebf 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -574,7 +574,9 @@ static void skip_request(struct i915_request *rq) static void reset_ring(struct intel_engine_cs *engine, struct i915_request *rq) { - GEM_TRACE("%s seqno=%x\n", engine->name, rq ? rq->global_seqno : 0); + GEM_TRACE("%s request global=%d, current=%d\n", + engine->name, rq ? rq->global_seqno : 0, + intel_engine_get_seqno(engine)); /* * Try to restore the logical GPU state to match the continuation