From mboxrd@z Thu Jan 1 00:00:00 1970 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 A2BA8C021AA for ; Fri, 21 Feb 2025 10:18:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A38810E257; Fri, 21 Feb 2025 10:18:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="ZnJZr/JO"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D8AC10E1F8 for ; Fri, 21 Feb 2025 10:17:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=d2nB1Dbhwkjt3ZVuyKfo0XCBlu4eYFNjc4srxcOHIag=; b=ZnJZr/JOROuGtulCNgtH530Yhc aKmVSQQyodoMg/ksrdXvDHM9BtJ9v9aF8IUrVejPMeCAoZ5AbZM+AkJ9NuF3Dp72AwU3ntZ/31fGl e4GyojFpXx3i+XBgnTKkqsrRWcOKFY2JxjKH9i8dl1VnRDeW1go0Bjr7GFzFFOf3snuV13itfsCQ8 iul3mdaKGi5FrxA52pztalUPxQXx6FgRhmtFW3kZgq8htzOXU3zpDgY93wotDuzf/Ganryu8yb5Tx LfiFVmN5zvEArUKnUlPKgb1uM2boJeW0zVtKRKhL2iiYep3OMqRTfJPtFF9a4033nci5eveoI5eQ2 7xwTX+Ng==; Received: from [90.241.98.187] (helo=localhost) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1tlQ6D-00G2bJ-UB; Fri, 21 Feb 2025 11:17:43 +0100 From: Tvrtko Ursulin To: intel-xe@lists.freedesktop.org Cc: kernel-dev@igalia.com, Tvrtko Ursulin Subject: [PATCH 06/12] drm/xe: Use fb cached min alignment Date: Fri, 21 Feb 2025 10:17:25 +0000 Message-ID: <20250221101736.78986-7-tvrtko.ursulin@igalia.com> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250221101736.78986-1-tvrtko.ursulin@igalia.com> References: <20250221101736.78986-1-tvrtko.ursulin@igalia.com> MIME-Version: 1.0 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" Instead of just looking at the first plane use the fb cached overall minimum alignment. This aligns with how the i915 version of intel_plane_pin_fb works. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/xe/display/xe_fb_pin.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c index 3df51cd4a86b..496257a60009 100644 --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c @@ -416,12 +416,9 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, const struct intel_plane_state *old_plane_state) { struct drm_framebuffer *fb = new_plane_state->hw.fb; - struct drm_gem_object *obj = intel_fb_bo(fb); - struct xe_bo *bo = gem_to_xe_bo(obj); - struct i915_vma *vma; struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb); - struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane); - unsigned int alignment = plane->min_alignment(plane, fb, 0); + struct xe_bo *bo = gem_to_xe_bo(intel_fb_bo(fb)); + struct i915_vma *vma; if (reuse_vma(new_plane_state, old_plane_state)) return 0; @@ -429,8 +426,8 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, /* We reject creating !SCANOUT fb's, so this is weird.. */ drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_FLAG_SCANOUT)); - vma = __xe_pin_fb_vma(intel_fb, &new_plane_state->view.gtt, alignment); - + vma = __xe_pin_fb_vma(intel_fb, &new_plane_state->view.gtt, + intel_fb->min_alignment); if (IS_ERR(vma)) return PTR_ERR(vma); -- 2.48.0