From patchwork Fri May 26 16:37:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257140 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 33942C7EE23 for ; Fri, 26 May 2023 16:38:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FFC210E816; Fri, 26 May 2023 16:38:18 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id C768210E816 for ; Fri, 26 May 2023 16:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119096; x=1716655096; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vk5C689FFftka3Qp6e/wlKz6bY3Lyj0znNDFbxynLZM=; b=HphMGXCqNaI3L5ydYfteH6CXvUiFvdxtQyQuHCaBuBNT9WOC2qdK9oOi aEZ28ciVPsmm4qCPuYACHAJWRKrWNh+Hzx//+8vdtP6NgyA1X7QaoLsal eeHO4t3IVmYoRtS7tSEfqq+Y9+ckdzufVSnMTiFgwWYbwORW7rxYVCVpC c2O1KThktN9/BsEZB87WhLxhr4NbqLlVKTm7a680NiB5/ILEZu+wcLjHm 34kyrWF/ZZhcY3C0ZtcpB0axk0iP098FoHUKcrPePHNKO6rInsNaNlIA3 nMUdshNgAZN0r8IUoM6iVEJLw4kBVprnoEcp4m3k4BFeO7DC+gqMqvA3n Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="417730897" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="417730897" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="682770153" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="682770153" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:15 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:54 +0300 Message-Id: <0988d237e56c56568f035053da8e2e2308a17d3a.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 01/15] drm/i915/plane: warn on non-zero plane offset 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We assume the plane offset is 0. Warn if it's not. This also fixes a warn on unused but set variable offset. Suggested-by: Ville Syrjälä Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 ++ drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c index 616654adbfb8..b52a681ca85e 100644 --- a/drivers/gpu/drm/i915/display/i9xx_plane.c +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c @@ -1037,6 +1037,8 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, } plane_config->base = base; + drm_WARN_ON(&dev_priv->drm, offset != 0); + val = intel_de_read(dev_priv, PIPESRC(pipe)); fb->width = REG_FIELD_GET(PIPESRC_WIDTH_MASK, val) + 1; fb->height = REG_FIELD_GET(PIPESRC_HEIGHT_MASK, val) + 1; diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 36070d86550f..6b01a0b68b97 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -2529,6 +2529,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, plane_config->base = base; offset = intel_de_read(dev_priv, PLANE_OFFSET(pipe, plane_id)); + drm_WARN_ON(&dev_priv->drm, offset != 0); val = intel_de_read(dev_priv, PLANE_SIZE(pipe, plane_id)); fb->height = REG_FIELD_GET(PLANE_HEIGHT_MASK, val) + 1; From patchwork Fri May 26 16:37:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257141 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 52462C7EE23 for ; Fri, 26 May 2023 16:38:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B57BB10E812; Fri, 26 May 2023 16:38:23 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21BA110E812 for ; Fri, 26 May 2023 16:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119102; x=1716655102; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nwGcy13lKWR+0Wh74VjL/urXlI96r5D8xTYXp8ofn8Y=; b=LLQsmYjZkp/z3Zu8dX9rPOtTrrXmqFGKj3uaC6n3Ba5DdTWwD7jsevnd cXmAI6Ochf+6MP7kEbUfHlFTuwcrja7QjbHVVapJaHxDXOHtMNvrtYSih XE0AAX3+vJekfej1fkt0TVMRHkLJdEsAj38PBHBhJWAHcr3H5V1L6c0Fq jwx6sgc53r5RRO6OoyAY0xzSVtJG6YZaCP8PVupKGyWgdHmNuN9WP3WSl TA3TYa8/gQY2g7NyNBtubZ1TAXq29wc0afyqIoWqifTWHSM1EtDYMhq73 cRmhHpaV4KHiLRC27kQJmYe767h/oSTgeUXsfShUG9o218lTDaNVU2b3k A==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="354261202" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="354261202" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="699468201" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="699468201" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:19 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:55 +0300 Message-Id: <66ca543b400a2048a6a84bb57a7bac8943014a96.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 02/15] drm/i915/ddi: drop unused but set variable intel_dp 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. The intel_dp variable has been unused since commit ef79fafe9dae ("drm/i915: Eliminate intel_dp.regs.dp_tp_{ctl,status}"). Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_ddi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index d1a9a3cf94b5..ced01813e097 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2225,12 +2225,10 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - struct intel_dp *intel_dp; if (!crtc_state->fec_enable) return; - intel_dp = enc_to_intel_dp(encoder); intel_de_rmw(dev_priv, dp_tp_ctl_reg(encoder, crtc_state), 0, DP_TP_CTL_FEC_ENABLE); } @@ -2239,12 +2237,10 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - struct intel_dp *intel_dp; if (!crtc_state->fec_enable) return; - intel_dp = enc_to_intel_dp(encoder); intel_de_rmw(dev_priv, dp_tp_ctl_reg(encoder, crtc_state), DP_TP_CTL_FEC_ENABLE, 0); intel_de_posting_read(dev_priv, dp_tp_ctl_reg(encoder, crtc_state)); From patchwork Fri May 26 16:37:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257142 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 CF75BC77B73 for ; Fri, 26 May 2023 16:38:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5707A10E817; Fri, 26 May 2023 16:38:27 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5080789954 for ; Fri, 26 May 2023 16:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119105; x=1716655105; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f9UTPUFsAOqnNgCnuvvwy1sFp1/natX5HKc1HOzVMYY=; b=g0CVKwxJmaEhcM/EpedCOB+aBC6qs+g0GgtXlO5uXRQ1QYx6AvNubLTb QRidJ25n7dUdzJlAQb/MphKXSa7FFdMhXbF9QQOd0Mrn6vkit6dqNzvbl jtvlzBco1TO52Kf5sVDh0Mule1TYwBhzVPUIc6+/SS8SDq7PIJufWBWPp 8zzRw1PhjXbrBxE5kNVBgCFqX/l8h1FaD3dKfxDWtlUMegxnWuKOnnIwj tH/+uKuAW1vBLHMmWITacRCPszp5h8cXI39kJ+7imi1CzsgJLlDXFq/ce cPeTiUPgntoVUeIPW6x6CsiTqYHb8n98SoSqtemR4OzDw4RJGNiUqCe3U g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="417730919" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="417730919" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="682770207" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="682770207" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:23 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:56 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 03/15] drm/i915/dsi: drop unused but set variable data 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c index cd90a30e04d8..aecd0142ce40 100644 --- a/drivers/gpu/drm/i915/display/vlv_dsi.c +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c @@ -136,7 +136,7 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host, enum port port = intel_dsi_host->port; struct mipi_dsi_packet packet; ssize_t ret; - const u8 *header, *data; + const u8 *header; i915_reg_t data_reg, ctrl_reg; u32 data_mask, ctrl_mask; @@ -145,7 +145,6 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host, return ret; header = packet.header; - data = packet.payload; if (msg->flags & MIPI_DSI_MSG_USE_LPM) { data_reg = MIPI_LP_GEN_DATA(port); From patchwork Fri May 26 16:37:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257143 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 6629AC7EE23 for ; Fri, 26 May 2023 16:38:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA77210E818; Fri, 26 May 2023 16:38:30 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9742710E818 for ; Fri, 26 May 2023 16:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119109; x=1716655109; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S0gwvdUWOA9TqC1NEJy87b8Y/Q0vz1HKWIg0IaT9Oxs=; b=kglLoFWb1MBmj93qhxDIIAO1TU8FEUCi7+crfMcc1dw6jykeB+hXFlxH DFlRda8nBcQOJxDHia6pt+WiDXxL1tCWfIETtEf2lYG+aFlNNYCLrV80o mh7HxFbQBBMjEB0qjPV0K1s8d+j4xPCeewLrDXrZ2UL2NMSjIu5mRzAav sLP0gjQ2f5vtLvw8/kQ2tE2Xup75I4Dqa8uR4fTZGijFW6ymbV4b6WBEc CvlHE0UfmRsBwLozQ3M8v+bUjFXkA6+5m7w3kCsMq58fkLU2hyVa3G2WJ 3jcsgcur68GJsHnK8uRUNuew8E6tqujjWVMPqC/6hXizTuR8Ww9j2eZZ0 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087508" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087508" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056495" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056495" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:27 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:57 +0300 Message-Id: <27efd245aa75226adcac01eff7b21781970f2736.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 04/15] drm/i915/dsi: drop unused but set variable vbp 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. The vbp is not used for anything in the readout, as we get e.g. crtc_vtotal from BXT_MIPI_TRANS_VTOTAL. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c index aecd0142ce40..ae2f3ab3e73d 100644 --- a/drivers/gpu/drm/i915/display/vlv_dsi.c +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c @@ -1039,7 +1039,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, unsigned int lane_count = intel_dsi->lane_count; unsigned int bpp, fmt; enum port port; - u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp; + u16 hactive, hfp, hsync, hbp, vfp, vsync; u16 hfp_sw, hsync_sw, hbp_sw; u16 crtc_htotal_sw, crtc_hsync_start_sw, crtc_hsync_end_sw, crtc_hblank_start_sw, crtc_hblank_end_sw; @@ -1104,7 +1104,6 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, /* vertical values are in terms of lines */ vfp = intel_de_read(dev_priv, MIPI_VFP_COUNT(port)); vsync = intel_de_read(dev_priv, MIPI_VSYNC_PADDING_COUNT(port)); - vbp = intel_de_read(dev_priv, MIPI_VBP_COUNT(port)); adjusted_mode->crtc_htotal = hactive + hfp + hsync + hbp; adjusted_mode->crtc_hsync_start = hfp + adjusted_mode->crtc_hdisplay; From patchwork Fri May 26 16:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257144 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 C0BDBC7EE23 for ; Fri, 26 May 2023 16:38:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39EDC10E81A; Fri, 26 May 2023 16:38:35 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B457D10E81A for ; Fri, 26 May 2023 16:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119112; x=1716655112; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=spdReR+wpRIOjLkbsMQPOaev4dyvbTU758xlimd9HiU=; b=D/1aejeDsy1IsX2bVAkw4qGphnMPSMsvmK7VlwR2MfurSRMS1EMxpyGr Nt8f+gCOrckGU/1PbXQrYTh/SxgvGSl7MaxK9R+obpjPNSZyRqjXphkju F/9ThNwhymXfjCeMbXimR5wIQzJ6iUMVrMcSTx4fZUCnRGVTGkkCOHum5 T7z4Vqk75q9cM0+y7dwx7m8+Dbufs2mKM/ba3iC/Z2WldjxHWWqG0o5/p navGEjLrQEsx2ZO16W3a3Fb3AJ/JSqIBF8r3qi7GPIYbxDfvLkhyU8FqQ Hm+23pxyPckfv5efnT+/KG9BQdNx0xurZsdDysb9V+5zOmZDWS3nc7zLr A==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087530" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087530" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056535" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056535" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:31 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:58 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 05/15] drm/i915/dpll: drop unused but set variables bestn and bestm1 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dpll.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c index 824be7f03724..999badfe2906 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll.c +++ b/drivers/gpu/drm/i915/display/intel_dpll.c @@ -1793,13 +1793,11 @@ static void chv_prepare_pll(const struct intel_crtc_state *crtc_state) enum pipe pipe = crtc->pipe; enum dpio_channel port = vlv_pipe_to_channel(pipe); u32 loopfilter, tribuf_calcntr; - u32 bestn, bestm1, bestm2, bestp1, bestp2, bestm2_frac; + u32 bestm2, bestp1, bestp2, bestm2_frac; u32 dpio_val; int vco; - bestn = crtc_state->dpll.n; bestm2_frac = crtc_state->dpll.m2 & 0x3fffff; - bestm1 = crtc_state->dpll.m1; bestm2 = crtc_state->dpll.m2 >> 22; bestp1 = crtc_state->dpll.p1; bestp2 = crtc_state->dpll.p2; From patchwork Fri May 26 16:37:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257147 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 382A5C7EE23 for ; Fri, 26 May 2023 16:38:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9090C10E825; Fri, 26 May 2023 16:38:49 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90FED10E823 for ; Fri, 26 May 2023 16:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119123; x=1716655123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=52uNhEEU5HtYv8tjmbZ5TJgOJL4buyKJUl9qg8xCQ/c=; b=NKyQkt+TKYwTkHBK3Id15KaIEsqSH4XdKQA5MojcEg6cVAUMWxw/Odrq L+N89epHhVeGHnz0Xz60W1+kK4Dd/aI6kCcApp6MF/iMiCJXmgf/DQeS2 L4ns5bzVCWRv9/wIKdf0qP+iFenaKt7C2Bfkxbhr70pMSxpaJ3arlAA5Z mj19kN0Jgt0ofJz+Mf+rztcfOiq9TpKRZButLzJgeD2PTLdP/ITLkpGij mRT303emiUccNgJq+iGpcErvO/9rWMHzKbn2GmuNHpr314SbsTLXkgg1D 2iiMNr+QuhYmffpHqaCd+wl/Ar6C4OlGj45M9npYaC2BwRAzhVuJ8SUH+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="354261235" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="354261235" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="699468248" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="699468248" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:35 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:37:59 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 06/15] drm/i915/fb: drop unused but set variable cpp 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 0d27a98dcbbe..446bbf7986b6 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1601,7 +1601,7 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer * for (i = 0; i < num_planes; i++) { struct fb_plane_view_dims view_dims; unsigned int width, height; - unsigned int cpp, size; + unsigned int size; u32 offset; int x, y; int ret; @@ -1618,7 +1618,6 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer * return -EINVAL; } - cpp = fb->base.format->cpp[i]; intel_fb_plane_dims(fb, i, &width, &height); ret = convert_plane_offset_to_xy(fb, i, width, &x, &y); From patchwork Fri May 26 16:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257145 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 8C9DAC7EE23 for ; Fri, 26 May 2023 16:38:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1287510E81E; Fri, 26 May 2023 16:38:43 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id E70E710E81E for ; Fri, 26 May 2023 16:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119120; x=1716655120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=92Cb7NJkqezgr39BLrF/2N7IitaOrxSEepSGCSe0V30=; b=bC4RKcvS9C+nbgCNPgBzLuKpCwFLqHxWamDnEmviClQ3Axjm/BA2iT85 9ius2D64FkVEdX8pubtX9Aw7VTj9yfyqk41TfV/sUS/brxeXR0gvQcbcx YlmjpFBPyoqNkzy6dU58Zqzyazjy0N2kyTVIur/NPaonGS7BiDQ2RAA0U TmTFWf/Wqq/OFmavbR8mdxQc/946nP3wqngJTITlpugISt8Yt6GZnOi26 ZTli9J20zj4//SsCLevNWpmHSwgqGAPBqYseP835Nlw8kTxvaYmSIfgu8 HiaTfsV24A21lUlRTG4yBNGlvcFceddOoSLyNdwO5WbyhSbFCNw8DLKru A==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087548" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087548" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056560" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056560" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:38 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:00 +0300 Message-Id: <6c529e8721d56b0148a3a84fb2d396d4485e09a2.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 07/15] drm/i915/irq: drop unused but set variable tmp 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_display_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c index 3b2a287d2041..31dd7c9c76b9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_irq.c +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c @@ -873,7 +873,7 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv, enum pipe pipe = INVALID_PIPE; enum transcoder dsi_trans; enum port port; - u32 val, tmp; + u32 val; /* * Incase of dual link, TE comes from DSI_1 @@ -920,7 +920,7 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv, /* clear TE in dsi IIR */ port = (te_trigger & DSI1_TE) ? PORT_B : PORT_A; - tmp = intel_uncore_rmw(&dev_priv->uncore, DSI_INTR_IDENT_REG(port), 0, 0); + intel_uncore_rmw(&dev_priv->uncore, DSI_INTR_IDENT_REG(port), 0, 0); } static u32 gen8_de_pipe_flip_done_mask(struct drm_i915_private *i915) From patchwork Fri May 26 16:38:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257146 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 1B98FC7EE2C for ; Fri, 26 May 2023 16:38:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB47C10E823; Fri, 26 May 2023 16:38:45 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85C0110E823 for ; Fri, 26 May 2023 16:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119124; x=1716655124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kfHfX80MY6hUIgVmagFEiCq4OmDTtX2KFZIAaV3KGVQ=; b=WWvkNuncNIRUamV49DPi4wKdIkT31/mFMGL8SxZYOBpG+t+V9XkEy2gt BplgIDFiGiGSrvR3h5xLOAVltCz/YDPIGEANR6uXOT92tFbkMGeVQzgj/ NU4V3snqIKsD6gc4J1PkTZrzFkDZ1T2zhkyQD6SnFIdQQ7Z18ZxAtv5vf l8pQHrwUDD2TG7KAjCzmI1xSZN4FAnCu5K94gKKB81atEX6uRR3yYnYTa BOBRCFQPCpdZkEbrPzdfMzXUSjNqyNaHmOwlg+4Ajv/4C+Ex9u9qLaG4b okfD0KbFNpw1BWR7vPW8zJr7pgfXM7Bbvwlt9zVQ8OaBQgyEVb88EEJgo Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087564" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087564" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056569" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056569" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:42 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:01 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 08/15] drm/i915/gt/uc: drop unused but set variable sseu 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Apparently sseu is leftover from commit 9a92732f040a ("drm/i915/gt: Add general DSS steering iterator to intel_gt_mcr"). Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c index 0ff864da92df..331cec07c125 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c @@ -301,7 +301,6 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc, const struct __guc_mmio_reg_descr_group *list; struct __guc_mmio_reg_descr_group *extlists; struct __guc_mmio_reg_descr *extarray; - struct sseu_dev_info *sseu; bool has_xehpg_extregs; /* steered registers currently only exist for the render-class */ @@ -318,7 +317,6 @@ guc_capture_alloc_steered_lists(struct intel_guc *guc, if (has_xehpg_extregs) num_steer_regs += ARRAY_SIZE(xehpg_extregs); - sseu = >->info.sseu; for_each_ss_steering(iter, gt, slice, subslice) num_tot_regs += num_steer_regs; From patchwork Fri May 26 16:38:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257149 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 1C4B7C7EE23 for ; Fri, 26 May 2023 16:38:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8684F10E826; Fri, 26 May 2023 16:38:53 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6585D10E825 for ; Fri, 26 May 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119128; x=1716655128; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h3GANNN96h7SUverMhbUaMHRSzMbcaAsxL/gcFlVM+o=; b=Pp1Q1GZK09enisAd96ONA7NDTiJeegMvfiNl3AwHpAq/4c6aTT+Ny+rx S9SIZiA81GC/0JxkAZrVmMIGXdTAHeVa7tTsE4TcqCs/XguBUTsAMFoF7 +81fFKaJt4ClKGO3cf/3NNkCLifqSs+BP7VU1NgzT7/PQuehRfEKRt6Ix /whJo3gFDKVsyUBP38soU5i8q+IxTiZFYrtWHRTTybZJwzZ8yUQWhBN+G H32KxWX/gUV88JAnJN3f6aPmjV0Qq7gBBS3GOSpuhS4vw/KAnSQUNhvo7 Funyj4w0Lnsl+MEu4mRpNip4Xy1FPSCGBb/ytUF0+/Dge48uOoppPKr8j g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087579" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087579" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056630" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056630" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:46 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:02 +0300 Message-Id: <6831c21567e8e84da424f32a8b7b48932803ab7b.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 09/15] drm/i915/gem: drop unused but set variable unpinned 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 5fb459ea4294..cfd7929587d8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -736,7 +736,6 @@ static int eb_reserve(struct i915_execbuffer *eb) struct eb_vma *ev; unsigned int pass; int err = 0; - bool unpinned; /* * We have one more buffers that we couldn't bind, which could be due to @@ -776,7 +775,7 @@ static int eb_reserve(struct i915_execbuffer *eb) pin_flags |= PIN_NONBLOCK; if (pass >= 1) - unpinned = eb_unbind(eb, pass >= 2); + eb_unbind(eb, pass >= 2); if (pass == 2) { err = mutex_lock_interruptible(&eb->context->vm->mutex); From patchwork Fri May 26 16:38:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257148 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 745FBC77B73 for ; Fri, 26 May 2023 16:38:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDC8610E82B; Fri, 26 May 2023 16:38:53 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5353C10E826 for ; Fri, 26 May 2023 16:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119132; x=1716655132; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pB4LR7bHTjJsV3MiPDsNn5ko+0MrhqhmfTMz5QDDtmg=; b=WFx2POUBwUuGCiYuVAd0UIeCkWLKG76Lj785YFO0WzCuTyhP/XwLNchU MFCAoQSTbxekPHP2gorSW4iypcN07nBomkFn3KxcpUDNL8os5IyrxWOnr PaegfhSEc2uArocI9zPDyenqOoyDOdJwaK4/Hi4gM5CwspMcvOAiqKbx3 PKFvJOT7OJBhUpzCF8rG34usw2dWPyO88DKf2yJgUhqjhx3mR8RInqKpe lHn9CxvRTyc1dunUa0EUwj6Y3e8X7O2kwcfPPmWAaQzP9I6J7MC34iwfk 7aFKTXC+EWG3qo7zUBFbe7x1FdhVjxVtorby7o/BdKbnRprqZZzdGStRe A==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="353087594" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="353087594" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="736056658" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="736056658" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:50 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:03 +0300 Message-Id: <9ee9e7d7a0a7ad4ff03c14e64b95d3fbcb7885a4.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 10/15] drm/i915/gem: annotate maybe unused but set variable c 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. The variable 'c' appears unused, but I'm not sure what should be done with it. Annotate it with __maybe_unused. Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index cad4a6017f4b..33d5d5178103 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -455,7 +455,7 @@ shmem_pwrite(struct drm_i915_gem_object *obj, struct page *page; void *data, *vaddr; int err; - char c; + char __maybe_unused c; len = PAGE_SIZE - pg; if (len > remain) From patchwork Fri May 26 16:38:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257150 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 6CBA7C77B73 for ; Fri, 26 May 2023 16:38:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CEA0B10E820; Fri, 26 May 2023 16:38:58 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AA2710E829 for ; Fri, 26 May 2023 16:38:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119137; x=1716655137; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=t1Qw8eRIGl23tyFfXNPfYO6ZhhJVetVy+Tz6JiIz5ww=; b=XfqP7D8jGz7k7Os+hlDDTCKOXgnzd1bDwNazcgDq7MDHTIrvwOiUbBwA VeR2Gf28xgQ+s8q2VtOQ/pKH8ZROG54Vcf3jrGWbmrffQEr4+en9RSvS/ 07Zjtx+lyieBhO9x1rAEcS4zSbNwf7heMLaIwq7LWb0/FkR4Ru4XDbTW8 j1hrPka4Jva7WEKcZ4b3eweFKpk5DEcK9svB+/gJEs/JEV9WMFNlU7vQM jjpBy3XzpCiQZCD71gQhFZn1ckO3e+/J/v22w1Ek3IzALuAKmc/DGK0IW pN76XlGMdryJPeRrEVNeANUbqc9GszKvmSit6iWOsnd//4f6U/DWs338V g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="420006257" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="420006257" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="951949660" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="951949660" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:54 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:04 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 11/15] drm/i915/selftest: annotate maybe unused but set variable unused 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. The variable is indeed 'unused' as the name suggests, but we can't just drop it because i915_vma_unbind_unlocked() is annotated __must_check. Apparently the selftest does not really need to check the value. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 36940ef10108..5c397a2df70e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -391,7 +391,7 @@ static void close_object_list(struct list_head *objects, struct i915_address_space *vm) { struct drm_i915_gem_object *obj, *on; - int ignored; + int __maybe_unused ignored; list_for_each_entry_safe(obj, on, objects, st_link) { struct i915_vma *vma; From patchwork Fri May 26 16:38:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257151 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 4A40EC77B73 for ; Fri, 26 May 2023 16:39:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E4E3C10E816; Fri, 26 May 2023 16:39:03 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id EFD5610E829 for ; Fri, 26 May 2023 16:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119139; x=1716655139; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fdkLaB2kpZqOBZgd65szLbCJthliq+6iNa/+Iz0lbRs=; b=NLL6BUcAMvqtRMxCQ8+WTcoOCfhfTVnC56RAoatttr5C747fti7oQb+E c0P9/5pRzaCiVzNu1eYDmKu2Qbr2ugSpOawzb6qFMfF+wPVbW9U4aFzEH kKzDRf1+/Eq7MrpPtQY4HFYfM8Ysk1MbjV0wkH6sNx3arrKfsXyTrjXAz HnbVSbstTQ65kRPHqeJ9Kua/a3B3e2rgNEj4PPMspFjr4j0Q096F28DEm 8UegpJc041VRFLVVillrwVRzVeTqW3m058TsU+9F0QpzZadKoFKzZR13u A+i7H027ezUY6AthhutpD5fBsULcwo12dYS6Ws6hjKeh/J3Ur81sOCDNG g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="420006263" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="420006263" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="951949668" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="951949668" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:38:58 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:05 +0300 Message-Id: <438ff3b257b7f85ecca5750ae8687336faee0a79.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 12/15] drm/i915: annotate maybe unused but set intel_plane_state variables 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. for_each_new_intel_plane_in_state() requires passing in a struct intel_plane_state pointer, which it uses, but in many places this leads to warning about unused but set variables. Annotate them with __maybe_unused. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 8 ++++---- drivers/gpu/drm/i915/display/intel_fbc.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c index 4125ee07a271..7d9578ebae55 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c @@ -722,7 +722,7 @@ skl_next_plane_to_commit(struct intel_atomic_state *state, { struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); - struct intel_plane_state *plane_state; + struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int i; diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index 6bed75f1541a..41eebae46d99 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -2947,7 +2947,7 @@ int intel_cdclk_atomic_check(struct intel_atomic_state *state, { const struct intel_cdclk_state *old_cdclk_state; const struct intel_cdclk_state *new_cdclk_state; - struct intel_plane_state *plane_state; + struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int ret; int i; diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 38836e2e8807..a1e635ab0315 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -971,7 +971,7 @@ static void intel_crtc_enable_flip_done(struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); u8 update_planes = crtc_state->update_planes; - const struct intel_plane_state *plane_state; + const struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int i; @@ -988,7 +988,7 @@ static void intel_crtc_disable_flip_done(struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); u8 update_planes = crtc_state->update_planes; - const struct intel_plane_state *plane_state; + const struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int i; @@ -5609,7 +5609,7 @@ static int intel_crtc_add_bigjoiner_planes(struct intel_atomic_state *state, struct intel_crtc *crtc, struct intel_crtc *other) { - const struct intel_plane_state *plane_state; + const struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; u8 plane_ids = 0; int i; @@ -5652,7 +5652,7 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state) { struct drm_i915_private *dev_priv = to_i915(state->base.dev); struct intel_crtc_state *old_crtc_state, *new_crtc_state; - struct intel_plane_state *plane_state; + struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; struct intel_crtc *crtc; int i, ret; diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 1966f9396201..29aa029d249d 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -1254,7 +1254,7 @@ static bool __intel_fbc_pre_update(struct intel_atomic_state *state, bool intel_fbc_pre_update(struct intel_atomic_state *state, struct intel_crtc *crtc) { - const struct intel_plane_state *plane_state; + const struct intel_plane_state __maybe_unused *plane_state; bool need_vblank_wait = false; struct intel_plane *plane; int i; @@ -1309,7 +1309,7 @@ static void __intel_fbc_post_update(struct intel_fbc *fbc) void intel_fbc_post_update(struct intel_atomic_state *state, struct intel_crtc *crtc) { - const struct intel_plane_state *plane_state; + const struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int i; @@ -1408,7 +1408,7 @@ void intel_fbc_flush(struct drm_i915_private *i915, int intel_fbc_atomic_check(struct intel_atomic_state *state) { - struct intel_plane_state *plane_state; + struct intel_plane_state __maybe_unused *plane_state; struct intel_plane *plane; int i; From patchwork Fri May 26 16:38:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257152 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 47E29C77B73 for ; Fri, 26 May 2023 16:39:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B238910E812; Fri, 26 May 2023 16:39:06 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F16810E824 for ; Fri, 26 May 2023 16:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119144; x=1716655144; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hRDjaWP+ETw6kRXLPtFEoxIQPgv2pvb7KQQ0F80fovw=; b=Xn5uZmDk154NKMHtmoZ+Mamg/lBUCSDSHUE2WG2KkzlP2Im4TGJka1HA 5sAxvARb4iymmSgeGPxm4SrKOWm9LDA6n4ZN4BOQ+NZIWBVO1zYx2OtIX p4HdGTcjS/SOfn7sMud/Zow8I0mwqtHJdAz7gQnzmYduqb+fTsPsZYhnw ZprrLiic64qsnSQpUAzYbN0h58epQsDX3Co+Ey8MKsxxkElBpVaunNrlb /533VFaGo44fS+39DSxpt1/EZ14AL2rvK945eD1kGZ3F3HRKqj2nVn3oD 6EMQhRroKqaHAjkfUX3Z8Ve5eQ6LahwYgrDOQtP/1ysK6W1dgBRn65Rrx Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="333872448" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="333872448" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="817608597" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="817608597" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:02 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:06 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 13/15] drm/i915: annotate maybe unused but set intel_crtc_state variables 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. for_each_new_intel_crtc_in_state() requires passing in a struct intel_crtc_state pointer, which it uses, but in a few places this leads to warning about unused but set variables. Annotate them with __maybe_unused. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/skl_watermark.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index a1e635ab0315..4854d8ff6e1e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5707,7 +5707,7 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state) static int intel_atomic_check_crtcs(struct intel_atomic_state *state) { - struct intel_crtc_state *crtc_state; + struct intel_crtc_state __maybe_unused *crtc_state; struct intel_crtc *crtc; int i; diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index d1245c847f1c..063929a42a42 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -2900,7 +2900,7 @@ static int skl_compute_wm(struct intel_atomic_state *state) { struct intel_crtc *crtc; - struct intel_crtc_state *new_crtc_state; + struct intel_crtc_state __maybe_unused *new_crtc_state; int ret, i; for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { From patchwork Fri May 26 16:38:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257153 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 4AD1AC77B73 for ; Fri, 26 May 2023 16:39:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C281410E817; Fri, 26 May 2023 16:39:10 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B2E910E824; Fri, 26 May 2023 16:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119149; x=1716655149; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qpeOPviOSpuDkEmBcvIVIfA2YGl0hIe+9aDqFD0vl4g=; b=gV6dpdGeriHlAmlFMVNdstoLBGhyDdn3+jcqCHCBhsYBAyYfiGfGqWBy QqtWuCsdUpMNwgoGJo0V5AGydNw+E7MiIOfnV9++a3XSRt5SvRKV+a+8n 7E2z4p8JLBbgn7nLlH4KznFZWuYDxjteT1coMbaJQgo9C6yEnACZin672 axv0KrRptDTXmis8F1AFQzpFDKe/WA7D2pjfR6/yMmVMsQfiaro8cxUiq J+GsG6R7n/W5G14mevqHqrtE3QZAXpwSrzl8gWo3pq5e1K9Xyiftvv2+V EHKe1yv25c4RLOiw6Gd0HQRkFghnBNvlBha9b8LpCdhrzT6Btl6lAKiaw g==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="420006276" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="420006276" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="951949687" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="951949687" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:06 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:07 +0300 Message-Id: <7e1c475bf123eca6935a1be099cc0608bed49b0b.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 14/15] drm/i915/gvt: annotate maybe unused gma_bottom variables 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: , Cc: jani.nikula@intel.com, intel-gvt-dev@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Prepare for re-enabling -Wunused-but-set-variable. Lacking a better idea, annotate the gma_bottom variables with __maybe_unused. Cc: Zhenyu Wang Cc: Zhi Wang Cc: intel-gvt-dev@lists.freedesktop.org Signed-off-by: Jani Nikula --- Frankly I'm not sure what to do with these. Maybe the variables should be dropped altogether? --- drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 3c4ae1da0d41..2801e17e5522 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2833,7 +2833,7 @@ static int command_scan(struct parser_exec_state *s, static int scan_workload(struct intel_vgpu_workload *workload) { - unsigned long gma_head, gma_tail, gma_bottom; + unsigned long gma_head, gma_tail, __maybe_unused gma_bottom; struct parser_exec_state s; int ret = 0; @@ -2874,7 +2874,7 @@ static int scan_workload(struct intel_vgpu_workload *workload) static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) { - unsigned long gma_head, gma_tail, gma_bottom, ring_size, ring_tail; + unsigned long gma_head, gma_tail, __maybe_unused gma_bottom, ring_size, ring_tail; struct parser_exec_state s; int ret = 0; struct intel_vgpu_workload *workload = container_of(wa_ctx, From patchwork Fri May 26 16:38:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13257154 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 4B8F1C7EE23 for ; Fri, 26 May 2023 16:39:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8C7D10E82C; Fri, 26 May 2023 16:39:14 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EE3510E829 for ; Fri, 26 May 2023 16:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685119152; x=1716655152; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yGlIP1ZZuYJpsv8ER5otodLTjdEN0q6nbJ2y1RznZf8=; b=C14/MPyfsxFZVmtBUbbnBMmVPdxEqM8zWhySD3A1ZcLMqfuHkLk2bCur G0WGe5uBhcEEbVCNqFO/dZQ7CCjyeldMLF35/ZgMlaGjeczJ6vkq7v5JZ 6S5PI2cp6P2INBDBtyRXA/gRZCoEw7aEzZ2HuDi7u6F9cjjwkn4aFnd6t XEnIlaivygOm3QgQbrUPDZ5uy0fbfW/GS2yL/FRcuPEuuLDf1Fc2td6Et djxBA6ntR+5GrokA5IpHCAIvButvHTZutjfMA0iBTCZ2i59aUHjW3hck9 A2pNXpe++KzIRML8tNFi2qJeZ+sf7I7tPxXmQsA8h08UEU5dCFEg/826R Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="420006282" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="420006282" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10722"; a="951949695" X-IronPort-AV: E=Sophos;i="6.00,194,1681196400"; d="scan'208";a="951949695" Received: from akervine-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.216]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2023 09:39:10 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 May 2023 19:38:08 +0300 Message-Id: <28ca3f95fe77ceb8aa35b87fca73f7afbc89859a.1685119007.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 15/15] drm/i915: re-enable -Wunused-but-set-variable 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" W=1 enables -Wunused-but-set-variable. We disabled it locally in i915 Makefile as we were hitting a bunch of warnings. See commit 6a05d2900464 ("drm/i915: Disable unused-but-set compiler warning"). With the issues fixed or annotated with __maybe_unused, re-enable the warning not only in W=1 but also locally as part of i915 build. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 06374fc072d3..c704824e2a8c 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -19,7 +19,7 @@ subdir-ccflags-y += -Wno-type-limits subdir-ccflags-y += -Wno-missing-field-initializers subdir-ccflags-y += -Wno-sign-compare subdir-ccflags-y += -Wno-shift-negative-value -subdir-ccflags-y += $(call cc-disable-warning, unused-but-set-variable) +subdir-ccflags-y += $(call cc-option, -Wunused-but-set-variable) subdir-ccflags-y += $(call cc-disable-warning, frame-address) subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror