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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B799AC433FE for ; Wed, 13 Oct 2021 21:08:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7B64A61163 for ; Wed, 13 Oct 2021 21:08:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7B64A61163 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 100CB6E0EB; Wed, 13 Oct 2021 21:08:11 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B9876E0EB for ; Wed, 13 Oct 2021 21:08:10 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="227824022" X-IronPort-AV: E=Sophos;i="5.85,371,1624345200"; d="scan'208";a="227824022" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2021 14:08:09 -0700 X-IronPort-AV: E=Sophos;i="5.85,371,1624345200"; d="scan'208";a="592331127" Received: from ideak-desk.fi.intel.com ([10.237.68.141]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2021 14:08:08 -0700 Date: Thu, 14 Oct 2021 00:08:04 +0300 From: Imre Deak To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org Message-ID: <20211013210804.GC19061@ideak-desk.fi.intel.com> References: <20211007203517.3364336-1-imre.deak@intel.com> <20211007203517.3364336-4-imre.deak@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Subject: Re: [Intel-gfx] [PATCH 03/11] drm/i915: Add tiling attribute to the modifier descriptor 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" On Wed, Oct 13, 2021 at 11:18:27PM +0300, Ville Syrjälä wrote: > On Thu, Oct 07, 2021 at 11:35:09PM +0300, Imre Deak wrote: > > Add a tiling atttribute to the modifier descriptor, which let's us > > get the tiling without listing the modifiers twice. > > > > Signed-off-by: Imre Deak > > --- > > drivers/gpu/drm/i915/display/intel_fb.c | 20 ++++++++------------ > > 1 file changed, 8 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c > > index 2543232580885..ef3cd375c9942 100644 > > --- a/drivers/gpu/drm/i915/display/intel_fb.c > > +++ b/drivers/gpu/drm/i915/display/intel_fb.c > > @@ -115,6 +115,7 @@ const struct intel_modifier_desc { > > u64 display_versions; > > const struct drm_format_info *formats; > > int format_count; > > + u8 tiling; > > > > struct { > > #define INTEL_CCS_RC BIT(0) > > @@ -132,10 +133,12 @@ const struct intel_modifier_desc { > > { > > .id = I915_FORMAT_MOD_X_TILED, > > .display_versions = DISPLAY_VER_MASK_ALL, > > + .tiling = I915_TILING_X, > > }, > > { > > .id = I915_FORMAT_MOD_Y_TILED, > > .display_versions = DISPLAY_VER_MASK(9, 13), > > + .tiling = I915_TILING_Y, > > }, > > { > > .id = I915_FORMAT_MOD_Yf_TILED, > > @@ -144,6 +147,7 @@ const struct intel_modifier_desc { > > { > > .id = I915_FORMAT_MOD_Y_TILED_CCS, > > .display_versions = DISPLAY_VER_MASK(9, 11), > > + .tiling = I915_TILING_Y, > > > > .ccs.type = INTEL_CCS_RC, > > > > @@ -160,6 +164,7 @@ const struct intel_modifier_desc { > > { > > .id = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS, > > .display_versions = DISPLAY_VER_MASK(12, 13), > > + .tiling = I915_TILING_Y, > > > > .ccs.type = INTEL_CCS_RC, > > > > @@ -168,6 +173,7 @@ const struct intel_modifier_desc { > > { > > .id = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC, > > .display_versions = DISPLAY_VER_MASK(12, 13), > > + .tiling = I915_TILING_Y, > > > > .ccs.type = INTEL_CCS_RC_CC, > > > > @@ -176,6 +182,7 @@ const struct intel_modifier_desc { > > { > > .id = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS, > > .display_versions = DISPLAY_VER_MASK(12, 13), > > + .tiling = I915_TILING_Y, > > > > .ccs.type = INTEL_CCS_MC, > > > > @@ -556,18 +563,7 @@ intel_fb_align_height(const struct drm_framebuffer *fb, > > > > static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) > > { > > - switch (fb_modifier) { > > - case I915_FORMAT_MOD_X_TILED: > > - return I915_TILING_X; > > - case I915_FORMAT_MOD_Y_TILED: > > - case I915_FORMAT_MOD_Y_TILED_CCS: > > - case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS: > > - case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: > > - case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS: > > - return I915_TILING_Y; > > - default: > > - return I915_TILING_NONE; > > Had to double check that I915_TILING_NONE is really 0. It is. Yea, I guess better to explicitly init it. > > - } > > + return lookup_modifier(fb_modifier)->tiling; > > } > > > > unsigned int intel_cursor_alignment(const struct drm_i915_private *i915) > > -- > > 2.27.0 > > -- > Ville Syrjälä > Intel