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 2F3121073CA8 for ; Wed, 8 Apr 2026 12:31:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA51510E631; Wed, 8 Apr 2026 12:31:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="TmJi8H1B"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F18C10E631; Wed, 8 Apr 2026 12:31: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=1775651485; x=1807187485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UJNui/wnRqEgKC+BX5CzuzZBmLOQYwCwpOIiofJl/qw=; b=TmJi8H1BVPj+AS3aJbqnM19OK0fK3RTqm0nzf7slz/8BzUbwEWAVYSW0 zClyzz6E3VzD8TA0ph+klxRSENmjaV+dhe187z65bBHCTFUY0mDQSbgbR OayoPtaLY/FUMRezSUzWX3TeLdaeK4nQyaXwcachYm1JicQKEdXVO/J6g ujpZvNaIxWDlCY1PDgHSw+6ka4shwTPFn2jNdxE3R7sWXKJs6xajx9bnI mxer/ZGucJzM5ulWTQmAhQIxyCiKR4bBDSYEj/rJv7YYfgtIA2cS6WD78 IH66d6m81f3K9qfEunsvNlk6WWZ/hDtUOKlWUZoGe80BQfP5F3putksvp w==; X-CSE-ConnectionGUID: RpnphIyNRD+N1eYugxgRkw== X-CSE-MsgGUID: nQmjuC2QRnuZcUreANyKiw== X-IronPort-AV: E=McAfee;i="6800,10657,11752"; a="80519057" X-IronPort-AV: E=Sophos;i="6.23,167,1770624000"; d="scan'208";a="80519057" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2026 05:31:25 -0700 X-CSE-ConnectionGUID: Kji5EfU4R/2lN53R6L16lA== X-CSE-MsgGUID: K0mmsaFGReismHXvHfuZ5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,167,1770624000"; d="scan'208";a="251781975" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.245.73]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2026 05:31:22 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, Luca Coelho , Mitul Golani Subject: [PATCH v3 1/9] drm/i915/scaler: Don't clobber plane scaler scale factors with pfit scale factors Date: Wed, 8 Apr 2026 15:31:06 +0300 Message-ID: <20260408123115.15716-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260408123115.15716-1-ville.syrjala@linux.intel.com> References: <20260408123115.15716-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Ville Syrjälä When intel_atomic_setup_scaler() is called for a plane scaler it first computes the scale factors correctly, and then (if pfit is enabled on the pipe) it overwrites them with the pfit scale factors. Skip the pfit scaler stuff when intel_atomic_setup_scaler() is called for a plane scaler (plane_state != NULL). Reviewed-by: Luca Coelho Cc: Mitul Golani Fixes: 9217f9aaef62 ("drm/i915/scaler: Compute scaling factors for pipe scaler") 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 308b8d363bba..54507adc3073 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -482,7 +482,7 @@ static int intel_atomic_setup_scaler(struct intel_crtc_state *crtc_state, } } - if (crtc_state->pch_pfit.enabled) { + if (!plane_state && crtc_state->pch_pfit.enabled) { struct drm_rect src; int max_hscale, max_vscale; -- 2.52.0