From patchwork Tue Sep 12 11:06:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13381407 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 EDE98CA0ECA for ; Tue, 12 Sep 2023 11:07:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27EB710E3F2; Tue, 12 Sep 2023 11:07:46 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA1E410E3FB; Tue, 12 Sep 2023 11:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694516861; x=1726052861; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Bn3eA+nN1MZK+bJX9D1JN9gYkAlUw79/c8EAbPvvlu4=; b=YZXT5YdmYxudvhv+aLrYxc9ghfup3OviVV0Ekp7ExN66Bn34lq/rXNZE 0FqE1Rk9I/7Po2Ykf66Z2o2fm9ZDSEZE1ZDBXf/1uTx6E/tR3rA9xIbhH J1kEn2+18S8pg3D2ZLQVEfqc+suS1q1gEKpGg+S6QJARIfEvGgt2MDm5P pnm66ioqPMOAmpA96mhGr7J7xV/JBF9Jo/eaX3CRq+SjsEhfUEYvJWm7X xGFvDBCeRy8FCP7fIByW85Gpd0cvhPrCzEZESpP22zNGOzY2J+2y1Zxxn VCk5PMCiJRvFoN3qLFcVWgoW2a5CgbrTcJ4W6X07vxBXE2V4XnOB5brfL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10830"; a="409295472" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="409295472" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 04:07:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10830"; a="743688138" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="743688138" Received: from kscholl-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.63.206]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 04:07:30 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Subject: [PATCH 08/19] drm/i915/display: add I915 conditional build to intel_sprite.h Date: Tue, 12 Sep 2023 14:06:35 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add stubs for !I915. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_sprite.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h index 91c6dca342b2..044a032e41b9 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.h +++ b/drivers/gpu/drm/i915/display/intel_sprite.h @@ -16,6 +16,7 @@ struct intel_crtc_state; struct intel_plane_state; enum pipe; +#ifdef I915 struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe, int plane); int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, @@ -29,5 +30,12 @@ int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state); int vlv_plane_min_cdclk(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state); +#else +static inline struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv, + int pipe, int plane) +{ + return NULL; +} +#endif #endif /* __INTEL_SPRITE_H__ */