From patchwork Wed Apr 2 17:22:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 14036263 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 7DDD8C3601A for ; Wed, 2 Apr 2025 17:22:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1853910E870; Wed, 2 Apr 2025 17:22:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="IEeNGaqj"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 761E510E870; Wed, 2 Apr 2025 17:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743614570; x=1775150570; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+pmYCvj6hFFUeAjRbc86iDpBVcWU6gVxwToI5nh4PvU=; b=IEeNGaqjRSMieX2RLMc+upGDzi7PwqIeIXcSISbgKsubftrOt1J1aSNa sEiDVvlyEFdtqZ1O7zNOuTFKzfqHnwpKaO93Nm74SyBDHAvb+F6JD0hrd PQhTj3gRsqtq1SNserb8vl7GcnJl9Jx6ZM6cfiL66MLjpnogLMlNC4OKl m+vp2I7YaH5cFigQSbAqT+votbfJK4ahRBdeajEiNpF+PKIWs63bwV3JB XDTi0DDPoiAar5FBUzh64SaV9mxCXCaGACdw/BFpxgHY+nudVRvs7QFNi /DSpu0UsBne1qnKX3KjsBTdfUFZKzPuwnRbu+OC9n7drJyRr8Wil7YoCg g==; X-CSE-ConnectionGUID: mdso3cdATxSMPBMVoe5bOQ== X-CSE-MsgGUID: abNOkmnuSZ6r+tdhO05Xhg== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44891146" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44891146" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 10:22:50 -0700 X-CSE-ConnectionGUID: wioHdvnLR4Kq7XiecY23Uw== X-CSE-MsgGUID: wqni93FpRoCRrOtFT+u+Pw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="131964904" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 02 Apr 2025 10:22:47 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 02 Apr 2025 20:22:46 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: [PATCH v2 2/6] drm/i915: Nuke intel_plane_ggtt_offset() Date: Wed, 2 Apr 2025 20:22:36 +0300 Message-ID: <20250402172240.9275-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250402172240.9275-1-ville.syrjala@linux.intel.com> References: <20250402172240.9275-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ä We don't really need the extra intel_plane_ggtt_offset() wrapper anymore. Get rid of it. Signed-off-by: Ville Syrjälä Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 ----- drivers/gpu/drm/i915/display/intel_atomic_plane.h | 2 -- drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- drivers/gpu/drm/xe/display/xe_fb_pin.c | 2 +- drivers/gpu/drm/xe/display/xe_plane_initial.c | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c index 7276179df878..264a50b29c16 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c @@ -1565,8 +1565,3 @@ int intel_atomic_check_planes(struct intel_atomic_state *state) return 0; } - -u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state) -{ - return i915_ggtt_offset(plane_state->ggtt_vma); -} diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h index 6efac923dcbc..65edd88d28a9 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h @@ -88,6 +88,4 @@ int intel_atomic_add_affected_planes(struct intel_atomic_state *state, struct intel_crtc *crtc); int intel_atomic_check_planes(struct intel_atomic_state *state); -u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state); - #endif /* __INTEL_ATOMIC_PLANE_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index fb7d0c8b9302..f2d8675dd98a 100644 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c @@ -311,7 +311,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, plane_state->surf = i915_gem_object_get_dma_address(obj, 0) + plane->surf_offset(plane_state); } else { - plane_state->surf = intel_plane_ggtt_offset(plane_state) + + plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma) + plane->surf_offset(plane_state); } diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index 1c49610eb42f..3afff528a7bd 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -356,7 +356,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc, i915_vma_pin_fence(vma) == 0 && vma->fence) plane_state->flags |= PLANE_HAS_FENCE; - plane_state->surf = intel_plane_ggtt_offset(plane_state); + plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma); plane_state->uapi.src_x = 0; plane_state->uapi.src_y = 0; diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c index b9c45a5a3d82..b2e979805455 100644 --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c @@ -438,7 +438,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state, new_plane_state->ggtt_vma = vma; - new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) + + new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) + plane->surf_offset(new_plane_state); return 0; diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c index a15f60835239..c563edf14b1a 100644 --- a/drivers/gpu/drm/xe/display/xe_plane_initial.c +++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c @@ -239,7 +239,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc, plane_state->ggtt_vma = vma; - plane_state->surf = intel_plane_ggtt_offset(plane_state); + plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma); plane_state->uapi.src_x = 0; plane_state->uapi.src_y = 0;