From patchwork Fri Mar 25 14:28:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manna, Animesh" X-Patchwork-Id: 12791638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0909C433F5 for ; Fri, 25 Mar 2022 14:29:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E274B10E2AD; Fri, 25 Mar 2022 14:29:04 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79AB610E2AD for ; Fri, 25 Mar 2022 14:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648218543; x=1679754543; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HbHIabtNHBRSLGYfgxqONapx6UQ/gKckWHy99jTOEDI=; b=ZYmkdTK/hgkB7NAJKdWn31lcl/bDsYQxhzeLihPoi6DlpOcYHTyWi+KP a9lD9GSTFojgUDOHWlRqVCbNLx3NpLAXcKvbixoscFoOdglVcag0DugXT d7e7ekClE1/f17l/Zk90zvjlBc/ICCTXwJHwzLGGNI9c4yKbCrJLBQr3R XJiIEolkZBKSNYLZaqkZZ0UvzR+3Jfa1q5n4L3ttBhuip+do0urnWSU92 xXc5emFO7DycRxKYG/zcXGnbo4vteiOt11Ut8zRVd8oWwPSMP0NiXaGT+ J6dOPRNHq1V7uvTM3UQeMmyHbJzblIz4KImG1G2GRecAeO+9nVHH1MKeR A==; X-IronPort-AV: E=McAfee;i="6200,9189,10296"; a="256209947" X-IronPort-AV: E=Sophos;i="5.90,209,1643702400"; d="scan'208";a="256209947" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2022 07:29:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,209,1643702400"; d="scan'208";a="650254128" Received: from srr4-3-linux-101-amanna.iind.intel.com ([10.223.74.76]) by orsmga004.jf.intel.com with ESMTP; 25 Mar 2022 07:29:01 -0700 From: Animesh Manna To: intel-gfx@lists.freedesktop.org Date: Fri, 25 Mar 2022 19:58:42 +0530 Message-Id: <20220325142842.6411-1-animesh.manna@intel.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/dsb: modified to drm_info in dsb_prepare() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The request to aqquire gem resources is failing for DSB in rare scenario where it is busy and the register programming will be done through mmio fallback path. DSB has extra advantage of faster register programming which may go away through mmio path. Adding wait for gem resource also may not be right as anyways losing time. To make the CI execution happy replaced drm_err() to drm_info() for printing debug info during dsb buffer preparation. v1: Initial version. v2: Added print for mmio fallback at out label. [Nirmoy] Cc: Nirmoy Das Signed-off-by: Animesh Manna --- drivers/gpu/drm/i915/display/intel_dsb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index b34a67309976..86c0cf5a03b5 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -283,14 +283,12 @@ void intel_dsb_prepare(struct intel_crtc_state *crtc_state) obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE); if (IS_ERR(obj)) { - drm_err(&i915->drm, "Gem object creation failed\n"); kfree(dsb); goto out; } vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0); if (IS_ERR(vma)) { - drm_err(&i915->drm, "Vma creation failed\n"); i915_gem_object_put(obj); kfree(dsb); goto out; @@ -298,7 +296,6 @@ void intel_dsb_prepare(struct intel_crtc_state *crtc_state) buf = i915_gem_object_pin_map_unlocked(vma->obj, I915_MAP_WC); if (IS_ERR(buf)) { - drm_err(&i915->drm, "Command buffer creation failed\n"); i915_vma_unpin_and_release(&vma, I915_VMA_RELEASE_MAP); kfree(dsb); goto out; @@ -311,6 +308,9 @@ void intel_dsb_prepare(struct intel_crtc_state *crtc_state) dsb->ins_start_offset = 0; crtc_state->dsb = dsb; out: + if (!crtc_state->dsb) + drm_info(&i915->drm, "Fallback to mmio for register programming\n"); + intel_runtime_pm_put(&i915->runtime_pm, wakeref); }