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 X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 719ACC433F5 for ; Thu, 23 Sep 2021 11:50:50 +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 3AC3360F44 for ; Thu, 23 Sep 2021 11:50:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3AC3360F44 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 A4C246E0D4; Thu, 23 Sep 2021 11:50:49 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52AEC6E0D4 for ; Thu, 23 Sep 2021 11:50:48 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="223856861" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="223856861" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 04:50:47 -0700 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="550901492" Received: from unknown (HELO intel.com) ([10.237.72.91]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 04:50:45 -0700 Date: Thu, 23 Sep 2021 14:51:37 +0300 From: "Lisovskiy, Stanislav" To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, jani.saarinen@intel.com, maarten.lankhorst@linux.intel.com, matthew.d.roper@intel.com Message-ID: <20210923115137.GA5962@intel.com> References: <20210923084858.5480-1-stanislav.lisovskiy@intel.com> <87tuibbn7e.fsf@intel.com> <20210923104411.GA5676@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210923104411.GA5676@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH] drm/i915: Tile F plane format support 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 Thu, Sep 23, 2021 at 01:44:11PM +0300, Lisovskiy, Stanislav wrote: > On Thu, Sep 23, 2021 at 01:28:21PM +0300, Jani Nikula wrote: > > On Thu, 23 Sep 2021, Stanislav Lisovskiy wrote: > > > @@ -1941,6 +1951,10 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane, > > > if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) > > > return false; > > > break; > > > + case I915_FORMAT_MOD_F_TILED: > > > + if (!HAS_FTILE(dev_priv)) > > > + return false; > > > + fallthrough; > > > default: > > > return false; > > > } > > > > Seems odd. > > I agree, however this wasn't even added by me. > This patch got changed in ridiculous ways since last time, > I ever touched it. > Currently we have it internally exactly same way(wondering why) > Unfortunately didn't pay attention to this, was assuming > that if its r-bed and pushed - can trust it. Actually checked - seems to be result of wrong merge conflict resolution by me. It was initially that way: - case DRM_FORMAT_MOD_LINEAR: - case I915_FORMAT_MOD_X_TILED: - break; case I915_FORMAT_MOD_Y_TILED: if (IS_DG2(dev_priv)) return false; @@ -1928,6 +1934,13 @@ static bool gen12_plane_format_mod_supported(struct drm_plane *_plane, if (IS_DG2(dev_priv)) return false; break; + case I915_FORMAT_MOD_F_TILED: + if (!HAS_FTILE(dev_priv)) + return false; + fallthrough; + case DRM_FORMAT_MOD_LINEAR: + case I915_FORMAT_MOD_X_TILED: + break; So my bad here. Need to put this back. Stan > > Stan > > > > > > BR, > > Jani. > > > > > > -- > > Jani Nikula, Intel Open Source Graphics Center