From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E47B8762E0; Mon, 15 Apr 2024 14:38:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191909; cv=none; b=hR+6402L/WqCLopKrrrxmjwL5CBl1w/9rtEqQext6eNnCTlgym+bxuEwc/eK9pEgZSlzEx4P/4MeTBQm50IQsvrW79qcs1nI3iM/GaPEJosKLTKXNPxe7AmH4dRXLrj7kM3U0MQJws5V9KDcUGYHqX1e7WRZqs5H+4FhVF9fenI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191909; c=relaxed/simple; bh=ccKHxljBDzcXdDbhz2r2CJ6lFjG5jofGyolN9cSOVc0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=liIvl2ERs6s7ABhkRQurAHRjJsJfarI5psQbK2d6hrMZQbNhPnkvlOYtPzvsTiYCQ9I0aPn5KyRT7m/AVUUlYjyDkN9KFSP9fUTx10+tcOL9rdJdEYpmXLJARr5noDjYEK+6q89b16nZ7HdgyyQjiQBsKKCt8rAMK2b+A5eTqLA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kbron5Ru; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kbron5Ru" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EE04C113CC; Mon, 15 Apr 2024 14:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713191908; bh=ccKHxljBDzcXdDbhz2r2CJ6lFjG5jofGyolN9cSOVc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kbron5Ru9+YZL9ABIhVRWlXAKSlO13zQu5XMNxD+W+0Xbv0uTc3kJnti0jHXaa+0j 2Xn6tV8zeoC+6ljyF4+yN9g9XqmWkcNyr3zhpe6+UEh+givivtaj8z74vIVzx21UdG FnNbCNEfLEqMwheEFsHVBUyn6uiFtlZyKX6OfLro= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vidya Srinivas , Vandita Kulkarni , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Rodrigo Vivi Subject: [PATCH 6.6 089/122] drm/i915/vrr: Disable VRR when using bigjoiner Date: Mon, 15 Apr 2024 16:20:54 +0200 Message-ID: <20240415141956.046637186@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141953.365222063@linuxfoundation.org> References: <20240415141953.365222063@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä commit dcd8992e47f13afb5c11a61e8d9c141c35e23751 upstream. All joined pipes share the same transcoder/timing generator. Currently we just do the commits per-pipe, which doesn't really work if we need to change switch between non-VRR and VRR timings generators on the fly, or even when sending the push to the transcoder. For now just disable VRR when bigjoiner is needed. Cc: stable@vger.kernel.org Tested-by: Vidya Srinivas Reviewed-by: Vandita Kulkarni Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-6-ville.syrjala@linux.intel.com Signed-off-by: Ville Syrjälä (cherry picked from commit f9d5e51db65652dbd8a2102fd7619440e3599fd2) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_vrr.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -111,6 +111,13 @@ intel_vrr_compute_config(struct intel_cr if (!intel_vrr_is_capable(connector)) return; + /* + * FIXME all joined pipes share the same transcoder. + * Need to account for that during VRR toggle/push/etc. + */ + if (crtc_state->bigjoiner_pipes) + return; + if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) return;