From patchwork Tue Apr 13 17:32:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12201063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4DFEC433B4 for ; Tue, 13 Apr 2021 17:33:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4ED00611F0 for ; Tue, 13 Apr 2021 17:33:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4ED00611F0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B11EA89906; Tue, 13 Apr 2021 17:33:06 +0000 (UTC) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3A0789906 for ; Tue, 13 Apr 2021 17:33:05 +0000 (UTC) Received: by mail-pf1-x429.google.com with SMTP id o123so11886869pfb.4 for ; Tue, 13 Apr 2021 10:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QadX2l/VhCoDiQq02W1wFzM6BXAUhVOUpocDgwaR3kk=; b=yKnZHe/y1S1yTFPJly1RPRZyhQB2gOYQea52OEKqONRs9cqVnOtSTSuUcY59Qie51x TeS0iPimeYUJu0AMT+Sfhcpi9dPoJnxtkV/TtezWdQ5hi7Ah9z6eoSXIJYdjFKkD6YHo NmM/ENWS796FhE6o+5WS46Hu28B4uXzESKcHOLnTgdzc0xNwQTI521iTaXDaVNXOO8or bJGsh04ECH9GEDqAux2z8FCHYEWSXPf10NWe7iUCJiPAT88/Jg/VHw0FHmZIirqOeoPt Ij/mWdMc8yXFxdGGlYZzSwx9YLwpfIiTtfnbfKz1yRavDPxN5SaNdjtPFStni9DXbsTL LWLA== 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:mime-version :content-transfer-encoding; bh=QadX2l/VhCoDiQq02W1wFzM6BXAUhVOUpocDgwaR3kk=; b=T7Wo8YeBi5ith5d+gwXYCqi/nLTVOe20xWCsoVB2O0LdxnGaU9E/Vz46ZCBtDCP6W0 RJBChRqA5zZaWfYt4FqMpM6PRyRs47qKT+qgG9p9tRO2Kz8ovcYMVUPdiYblONQYULBF 10MhmjKBCvCncdoQki3nyCc+I7If6OjsBtx45lWs76d+UHERqmQu8NvQsxWcl52VKScr dzVMJ0peP6alMNdT9tamOh4sk1hp01b8geyvqM643zuN2KAMf/LRBzGX+I2CmcdHNfno u7GAdxNIfh73KKlU1LszuJT0VGrnB40ZDqHacgzSw3Q6WFu7RP+nT/GjnUGwpzuRXcVm TUSw== X-Gm-Message-State: AOAM532FgSq8j15MZLuY+QS6QSfS1ibQOEpUqVPlRhdCtZiYr7YVtTdA E1IkmIU6XC80rbp3SBuAosSpMQ5IN9HMWw== X-Google-Smtp-Source: ABdhPJyb3fTQSaOZSC7CW/OTjYNX10ZsdkbJ2p/TuWHKhkl/nv/+f6ySCDAi2AMlVqSh0+8qcCGFDw== X-Received: by 2002:a63:c446:: with SMTP id m6mr32207237pgg.71.1618335184909; Tue, 13 Apr 2021 10:33:04 -0700 (PDT) Received: from omlet.lan (jfdmzpr04-ext.jf.intel.com. [134.134.137.73]) by smtp.gmail.com with ESMTPSA id a6sm13504205pfc.61.2021.04.13.10.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 10:33:04 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org Date: Tue, 13 Apr 2021 12:32:59 -0500 Message-Id: <20210413173259.472405-1-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/pm: Make the wm parameter of print_wm_latency a pointer 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" This fixes the following build error with GCC 11: In function ‘snb_wm_latency_quirk’, inlined from ‘ilk_setup_wm_latency’ at drivers/gpu/drm/i915/intel_pm.c:3109:3, inlined from ‘intel_init_pm’ at drivers/gpu/drm/i915/intel_pm.c:7695:3: drivers/gpu/drm/i915/intel_pm.c:3058:9: error: ‘intel_print_wm_latency’ reading 16 bytes from a region of size 10 [-Werror=stringop-overread] 3058 | intel_print_wm_latency(dev_priv, "Primary", dev_priv->wm.pri_latency); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/intel_pm.c: In function ‘intel_init_pm’: drivers/gpu/drm/i915/intel_pm.c:3058:9: note: referencing argument 3 of type ‘const u16 *’ {aka ‘const short unsigned int *’} drivers/gpu/drm/i915/intel_pm.c:2995:13: note: in a call to function ‘intel_print_wm_latency’ 2995 | static void intel_print_wm_latency(struct drm_i915_private *dev_priv, | ^~~~~~~~~~~~~~~~~~~~~~ As far as I can tell, we don't actually need 8 elements except on SKL and that uses dev_priv->wm.skl_latency which has enough. Signed-off-by: Jason Ekstrand Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3f6d8b502a619..59498794ac4ea 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2994,7 +2994,7 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv) static void intel_print_wm_latency(struct drm_i915_private *dev_priv, const char *name, - const u16 wm[8]) + const u16 *wm) { int level, max_level = ilk_wm_max_level(dev_priv);