From patchwork Thu Dec 7 19:34:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483917 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 A5BF3C4167B for ; Thu, 7 Dec 2023 19:34:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6787910E965; Thu, 7 Dec 2023 19:34:50 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D5C7110E09D for ; Thu, 7 Dec 2023 19:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977687; x=1733513687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x7JwbeZlmAnu+J4sqBwbzQ1kQYquGiO7GpVgmC4HGRY=; b=VlImI32Fs13mHnxXTStuwx8Rxa8agdb2/jUslHFIyI7fMQR5+sQ3HzJu Tj8nrR4ifi1r8dEFa9U3dpmJTtroh2r8YA+a7+INV6Vtga4BNg16+KWxG P3PbuHXKqhGWVNubZjBaRpGVG3WULNHONhbPxdUAW20QZFRROkjo6Du/S +k6xoDgURMRBOVqAL1wqWBjeTp20C/u1jtfC5unH12ZP82C1TR97S5Qnt I6mBrj6kjvfeNxqxmTKakvHTvyfLbf4+KPZkNelCCWbXykC0hsKIkMrgf vxRj6sEFycQoUDW7j6f9eWqn+QEoL9Df8VlPUb93LlyyaPxC7TOalZHOa g==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694335" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694335" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:34:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213022" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213022" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:34:45 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:34:44 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/8] drm/i915: Fix intel_atomic_setup_scalers() plane_state handling Date: Thu, 7 Dec 2023 21:34:34 +0200 Message-ID: <20231207193441.20206-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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: stable@vger.kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä Since the plane_state variable is declared outside the scaler_users loop in intel_atomic_setup_scalers(), and it's never reset back to NULL inside the loop we may end up calling intel_atomic_setup_scaler() with a non-NULL plane state for the pipe scaling case. That is bad because intel_atomic_setup_scaler() determines whether we are doing plane scaling or pipe scaling based on plane_state!=NULL. The end result is that we may miscalculate the scaler mode for pipe scaling. The hardware becomes somewhat upset if we end up in this situation when scanning out a planar format on a SDR plane. We end up programming the pipe scaler into planar mode as well, and the result is a screenfull of garbage. Fix the situation by making sure we pass the correct plane_state==NULL when calculating the scaler mode for pipe scaling. Cc: stable@vger.kernel.org Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/skl_scaler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 1e7c97243fcf..8a934bada624 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -504,7 +504,6 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, { struct drm_plane *plane = NULL; struct intel_plane *intel_plane; - struct intel_plane_state *plane_state = NULL; struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; struct drm_atomic_state *drm_state = crtc_state->uapi.state; @@ -536,6 +535,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, /* walkthrough scaler_users bits and start assigning scalers */ for (i = 0; i < sizeof(scaler_state->scaler_users) * 8; i++) { + struct intel_plane_state *plane_state = NULL; int *scaler_id; const char *name; int idx, ret; From patchwork Thu Dec 7 19:34:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483918 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 72568C4167B for ; Thu, 7 Dec 2023 19:34:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CEF6F10E966; Thu, 7 Dec 2023 19:34:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B07F110E966 for ; Thu, 7 Dec 2023 19:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977691; x=1733513691; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=qBv5W1zf1NfKMqKw4F47EWGdS/EUSyFhpUGg0Yx4ezU=; b=AhSUtsyhrePWOitbIU6phLjPR/I8AgoCsGdLdhrvmvSWc+O0e+vVfX6v 30XAmYgVOl233mzYc8KFlokQv3sUie4AJSzruvuYinlJESL+5u3qkjU9P ofeg1JpcJJrZKiOVzUAVMPlpxiV6Gv+SsQf4gzOQQpjgrW3uZxypGbpPE Yh5uCDdXM8/JzIpCiCikowkvb4IsboqQaaO2xaHT3DQjxgqo4LwJAW4uw HH6jtNbvSui1aQaO8C6Sb9bCArfaKrf51rMSTpUiw6orNR2byntdxXguj ZVKVf+i/0L67VPsCbga+Qxp9hKkcfnQ7VO1Ni46DHEyH1hbjhNqwII9Bx A==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694352" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694352" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:34:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213048" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213048" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:34:48 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:34:48 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/8] drm/i915: Streamline intel_dsc_pps_read() Date: Thu, 7 Dec 2023 21:34:35 +0200 Message-ID: <20231207193441.20206-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä intel_dsc_pps_read() is rather convoluted. Make it legible. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_vdsc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c index 5f2fb702e367..17d6572f9d0a 100644 --- a/drivers/gpu/drm/i915/display/intel_vdsc.c +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c @@ -812,13 +812,13 @@ void intel_dsc_disable(const struct intel_crtc_state *old_crtc_state) } static u32 intel_dsc_pps_read(struct intel_crtc_state *crtc_state, int pps, - bool *check_equal) + bool *all_equal) { struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_i915_private *i915 = to_i915(crtc->base.dev); i915_reg_t dsc_reg[2]; int i, vdsc_per_pipe, dsc_reg_num; - u32 val = 0; + u32 val; vdsc_per_pipe = intel_dsc_get_vdsc_per_pipe(crtc_state); dsc_reg_num = min_t(int, ARRAY_SIZE(dsc_reg), vdsc_per_pipe); @@ -827,20 +827,13 @@ static u32 intel_dsc_pps_read(struct intel_crtc_state *crtc_state, int pps, intel_dsc_get_pps_reg(crtc_state, pps, dsc_reg, dsc_reg_num); - if (check_equal) - *check_equal = true; + *all_equal = true; - for (i = 0; i < dsc_reg_num; i++) { - u32 tmp; + val = intel_de_read(i915, dsc_reg[0]); - tmp = intel_de_read(i915, dsc_reg[i]); - - if (i == 0) { - val = tmp; - } else if (check_equal && tmp != val) { - *check_equal = false; - break; - } else if (!check_equal) { + for (i = 1; i < dsc_reg_num; i++) { + if (intel_de_read(i915, dsc_reg[i]) != val) { + *all_equal = false; break; } } From patchwork Thu Dec 7 19:34:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483919 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 93237C4167B for ; Thu, 7 Dec 2023 19:34:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FFEA10E968; Thu, 7 Dec 2023 19:34:57 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A594410E968 for ; Thu, 7 Dec 2023 19:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977694; x=1733513694; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=auk74fqRL2US9dD0e5ek92fPtuCrdSANVM9X9BC60xg=; b=bz1BBOizQH8KJ4/wtkbGZ+N+DPG7Xtz1pw8UYRhRiBpd6nEtPhJ6r7br ba8521oxqgt1oPHAyTLn8MiYYrIWcqZNJ7VchfhTDW9SZS0HZoDBjgZQC SM+hR0OdSM/ZftZzHBzmq+L7BNKBYtiWgTPiwta0G+uQh5FH+T/01AeWK UEtlgEsG41iTUGPksXOaF7Y/OiCupotX6iRVHtVsGAHM48sQPVTVNKVCo DeljYjxhRBdD/EyLV1nKPvj+NZl3bYGlNUd/cocBlxjd0ZO1Q/OsvDGNK 9AARwPjBpWvcTXNfPgSgwYM7TzKqDv5uqsPhZq773oXEUqts3s73Vblf9 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694362" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694362" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:34:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213075" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213075" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:34:52 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:34:51 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 3/8] drm/i915: Drop redundant NULL check Date: Thu, 7 Dec 2023 21:34:36 +0200 Message-ID: <20231207193441.20206-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä intel_bios_get_dsc_params() is only called from gen11_dsi_dsc_compute_config() and it always passes a non-NULL crtc_state in. Drop the redundant check. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_bios.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 3e7e96acb24a..aa169b0055e9 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -3475,8 +3475,7 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder, if (!devdata->dsc) return false; - if (crtc_state) - fill_dsc(crtc_state, devdata->dsc, dsc_max_bpc); + fill_dsc(crtc_state, devdata->dsc, dsc_max_bpc); return true; } From patchwork Thu Dec 7 19:34:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483920 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 F3678C4167B for ; Thu, 7 Dec 2023 19:34:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8332610E969; Thu, 7 Dec 2023 19:34:59 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6A7710E969 for ; Thu, 7 Dec 2023 19:34: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=1701977697; x=1733513697; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=6PU9SnoCIJtB0uKQ/AktfON8W2KQT30fdopg1byyQrI=; b=i+a039rV1gb1/kMf9Gj07xPwoKHRGs1OSA9MDiYfHTSx+UOMVM1sp6jK MqKhLV5ydVegkvXSIMpkUJJ1z8XDfb1JCQN+aGicZtRXg/UPsSUiq1loy 3+Pv3OcBDKvhopCtE3f/kKd382YQ30SKsovK1UW3k80kRUriV1wGP916H 3hzaxkCZWpMBKMAc5kILS4QGl4VDZhZqc2c+x934W6xSYR8Gt/WDj2QJ4 0jXcOO/4MTnyjh08hJXlJlTD/DaTKbw84PhU2WyBaOSXdkVrQldIUPIMt JSo0YpvHQpg1Sm87quQF91ByeQ6Bu7zH/NzUUtB1dpvA33VGvzdPeRIgE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694371" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694371" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:34:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213138" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213138" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:34:55 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:34:54 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 4/8] drm/i915: Drop crtc NULL check from intel_crtc_active() Date: Thu, 7 Dec 2023 21:34:37 +0200 Message-ID: <20231207193441.20206-5-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä intel_crtc_active() is never called with a NULL crtc. Drop the redundant NULL check. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c index 03e8fb6caa83..11ca9572e8b3 100644 --- a/drivers/gpu/drm/i915/display/i9xx_wm.c +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c @@ -608,7 +608,7 @@ static bool intel_crtc_active(struct intel_crtc *crtc) * crtc->state->active once we have proper CRTC states wired up * for atomic. */ - return crtc && crtc->active && crtc->base.primary->state->fb && + return crtc->active && crtc->base.primary->state->fb && crtc->config->hw.adjusted_mode.crtc_clock; } From patchwork Thu Dec 7 19:34:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483921 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 81652C4167B for ; Thu, 7 Dec 2023 19:35:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD5FC10E958; Thu, 7 Dec 2023 19:35:01 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC12310E96C for ; Thu, 7 Dec 2023 19:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977700; x=1733513700; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1Mgeanvu43EVZXNZS3bsBmhbDjDSEG4zs6dmrb9cxuY=; b=O3KFgwT2eEfy2DnNj2eX5F2a9L2hH1HgyIt4ilMbDOvGE6hYTpXDtzER 4jm13Y3YPUKUDtGxh56xCxLVbKg6Ih2SJeQeZ79I4LrWFbzYLVMhKk02L gwdRhHcHx1Jy7ul4ObgGp/8vA3HpotRujC93xHrJa2KNzTyPUeB5KQfGd vvpqHbHphX5oQDiMXlSqKe1oOCx1vBASx0+pckA/sOjE6//AxACybRZXS 8TLgdKtgVla3zOthRs4C3IgEU9+WHM4KW5nrN8RK9iE7SETMeEJiB2wGI /FIawf9rV+eIRVBydwMy5RbO7K0MMORtj5HuW1qEApdWwF0SSxsn+JDmE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694379" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694379" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:35:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213163" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213163" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:34:58 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:34:57 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 5/8] drm/i915: Drop NULL fb check from intel_fb_uses_dpt() Date: Thu, 7 Dec 2023 21:34:38 +0200 Message-ID: <20231207193441.20206-6-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä intel_fb_uses_dpt() should not be called with a NULL fb, so drop the check. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 69c3cfe3120e..85dbb8a5abf3 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -771,7 +771,7 @@ bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier) bool intel_fb_uses_dpt(const struct drm_framebuffer *fb) { - return fb && to_i915(fb->dev)->display.params.enable_dpt && + return to_i915(fb->dev)->display.params.enable_dpt && intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier); } From patchwork Thu Dec 7 19:34:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483922 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 33259C4167B for ; Thu, 7 Dec 2023 19:35:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E0F210E96C; Thu, 7 Dec 2023 19:35:05 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB48110E96B for ; Thu, 7 Dec 2023 19:35: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=1701977703; x=1733513703; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=jTCaUSd2E9nBa0fWxNWrF3v/s65GonN9vsjrJfNmeng=; b=evdAei3L87/bIrsJYB6D51j29BJAM7mohAmmqUfA1VTPwhsItwDwDRbD qHjowPoKBvXHzoufSWdHdY6UgfDrxVp06XBUwKXpKMmzTsR9+UGKjFc+U 0nDS46kXBaRsengO+fSlP+spDvd6UFf/ZLnFpTKY7K9j7lxzd04sEw9ey P7wheWze57snDVpghc1TDiGNp30b2JTUEgO710P35Oa0FInuMpNh0YOgw fbvXonG7Rco9UxMwYmkyi1Z6uzvASZVB1+QSqA7NftD02yUZEKIfWEA+7 EXz6YPEG2HlGCC0iBqm1Wwdbg+P/DWbdqHXY7QKyw/mesxRFJci3TTuyY w==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694390" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694390" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:35:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213181" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213181" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:35:01 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:35:00 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 6/8] drm/i915: Clean up intel_get_frame_time_us() Date: Thu, 7 Dec 2023 21:34:39 +0200 Message-ID: <20231207193441.20206-7-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä intel_get_frame_time_us() is never called with a NULL crtc_state so drop the redundant check. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 6029bb71276c..0058b07a7cda 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -893,7 +893,7 @@ transcoder_has_psr2(struct drm_i915_private *dev_priv, enum transcoder cpu_trans static u32 intel_get_frame_time_us(const struct intel_crtc_state *cstate) { - if (!cstate || !cstate->hw.active) + if (!cstate->hw.active) return 0; return DIV_ROUND_UP(1000 * 1000, From patchwork Thu Dec 7 19:34:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483923 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 580E9C46CA3 for ; Thu, 7 Dec 2023 19:35:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE3CD10E975; Thu, 7 Dec 2023 19:35:08 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFC3610E972 for ; Thu, 7 Dec 2023 19:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977706; x=1733513706; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Dmp8qepmZ9kdmDBZ4zs/Lk5MnNk9jb7Sw0S1K+OIz3Y=; b=kFv7LxEob5iyRwnIYCF9U4Cdq8wdhwrTmzitpRf5LPaGZaTSnLW1sBLt LT2t5fCZzgQrbs0KSQAabPVs13/r9wdgHbQTL8EE8tzVyd7hTthfH8Cnk KKU6U9+mogo3Ydy2xpBof7yNtak8yVqZJ5uH7DirFmo8ISaVhrC4B8P4K 8zM1le8hNAt1YktEr3A1q0EvEC6ByIRgzNL7hNvkPHEmlwPsTk8WttHHO fa1rasD6q9rtiKXhaqhzF1zkzyQSbHeSzyjShHbL6VcIUVPoyStFE5Lov qnVrkVukUp0wVHV8BRujwLTt/sNh9X9LYyyGZe52q6R5Dyx8WVHI96YJl A==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694395" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694395" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:35:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213198" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213198" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:35:04 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:35:03 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 7/8] drm/i915: s/cstate/crtc_state/ in intel_get_frame_time_us() Date: Thu, 7 Dec 2023 21:34:40 +0200 Message-ID: <20231207193441.20206-8-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä Use standard variable name 'crtc_state' instead of 'cstate'. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_psr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 0058b07a7cda..b6e2e70e1290 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -891,13 +891,13 @@ transcoder_has_psr2(struct drm_i915_private *dev_priv, enum transcoder cpu_trans return false; } -static u32 intel_get_frame_time_us(const struct intel_crtc_state *cstate) +static u32 intel_get_frame_time_us(const struct intel_crtc_state *crtc_state) { - if (!cstate->hw.active) + if (!crtc_state->hw.active) return 0; return DIV_ROUND_UP(1000 * 1000, - drm_mode_vrefresh(&cstate->hw.adjusted_mode)); + drm_mode_vrefresh(&crtc_state->hw.adjusted_mode)); } static void psr2_program_idle_frames(struct intel_dp *intel_dp, From patchwork Thu Dec 7 19:34:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13483924 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 F3EE4C4167B for ; Thu, 7 Dec 2023 19:35:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64F4010E970; Thu, 7 Dec 2023 19:35:12 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD98510E977 for ; Thu, 7 Dec 2023 19:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977709; x=1733513709; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=jirQKXvMYIDM/qXfUX3ZLObKxjofFI9gJebTI0eAdzE=; b=NmuviqG6s2ZBF4gXNxQQewcfW8cJDwwXjxzZqLVLTtX6ERntCgOVGpv+ /oNsk5pnq8pop2crzdA4BRC26QANgtMwtGC1W34xunGIefndCJzj4u7JL AG3tjUet7dDBmGeZlFxI7JLGHzUMzFGiepdZuvnlE5IZ5dOYGwbYvm1Hv n19OtU7sduNA2Z6YgUrGBVnUMMRrsiON+oT1YMomL1uIjCTnLkZrGFvBy mq9cgyk4dHkJArY4aHW/yb3Wgm6kbyVE9+xsxqIWye9DJU8/9Ad7PHW+J uMK7Z+rZWitc9vpbI6NJsZSccq66I3nFvTJKSmAZ+XUW924VMA/nKbm4d w==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384694399" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="384694399" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:35:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765213221" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="765213221" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 07 Dec 2023 11:35:07 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Dec 2023 21:35:07 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 8/8] drm/i915/tv: Drop redundant null checks Date: Thu, 7 Dec 2023 21:34:41 +0200 Message-ID: <20231207193441.20206-9-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207193441.20206-1-ville.syrjala@linux.intel.com> References: <20231207193441.20206-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 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" From: Ville Syrjälä Neither 'tv_mode' or 'color_conversion' can be NULL, so drop the pointless checks. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_tv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c index 2ee4f0d95851..d4386cb3569e 100644 --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@ -1417,9 +1417,6 @@ set_tv_mode_timings(struct drm_i915_private *dev_priv, static void set_color_conversion(struct drm_i915_private *dev_priv, const struct color_conversion *color_conversion) { - if (!color_conversion) - return; - intel_de_write(dev_priv, TV_CSC_Y, (color_conversion->ry << 16) | color_conversion->gy); intel_de_write(dev_priv, TV_CSC_Y2, @@ -1454,9 +1451,6 @@ static void intel_tv_pre_enable(struct intel_atomic_state *state, int xpos, ypos; unsigned int xsize, ysize; - if (!tv_mode) - return; /* can't happen (mode_prepare prevents this) */ - tv_ctl = intel_de_read(dev_priv, TV_CTL); tv_ctl &= TV_CTL_SAVE;