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 05962ECAAD3 for ; Mon, 19 Sep 2022 08:11:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8604910E5AE; Mon, 19 Sep 2022 08:11:14 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id A134C10E5AE for ; Mon, 19 Sep 2022 08:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663575070; x=1695111070; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=RBB/bQ28ZNXTUUBGSOYn5fqkNg1UQWDihfEKNR07ic8=; b=m5O2EOTzPlSuPhvuPuChNWSKDpnPUGdlWF2s3vaujnJ2x2F0TzJvjzVp 0HGnWeAhT7FVxoWhArFrBWNlwIKz14jNX1X5yC92cps4uYPBAkL25PK/G 80BDjzZk4AJg6PPANg5KQTF6dE7ll3KyZmd4AQKBI/0RIYryQ60OREDCx Nk6AAqp1yxR8EDOjVdPFdE9Ql9PI6L8+T7dEHzOMfE0bzRBPWzi9k3o5E oKgzK2GvWbC6YtN9NBWLaFE3Qflcpnk/6hQVOi2o/wVGRkOM8/a9F2N2u fzpl4zbChufPx6M2Zp+QBSwHMdnqXXIM1DKXBD4zQrSaJCNdEUgDgVKji Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10474"; a="299328999" X-IronPort-AV: E=Sophos;i="5.93,327,1654585200"; d="scan'208";a="299328999" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2022 01:11:10 -0700 X-IronPort-AV: E=Sophos;i="5.93,327,1654585200"; d="scan'208";a="686878939" Received: from jjohns2-mobl2.amr.corp.intel.com (HELO localhost) ([10.252.57.205]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2022 01:11:08 -0700 From: Jani Nikula To: Lucas De Marchi In-Reply-To: <20220916152638.u3rnatqrq52x5d32@ldmartin-desk2.lan> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220916082642.3451961-1-jani.nikula@intel.com> <20220916152638.u3rnatqrq52x5d32@ldmartin-desk2.lan> Date: Mon, 19 Sep 2022 11:10:53 +0300 Message-ID: <87edw7rdgy.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915: fix device info for devices without display 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: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 16 Sep 2022, Lucas De Marchi wrote: > On Fri, Sep 16, 2022 at 11:26:42AM +0300, Jani Nikula wrote: >>Commit 00c6cbfd4e8a ("drm/i915: move pipe_mask and cpu_transcoder_mask >>to runtime info") moved the pipe_mask member from struct >>intel_device_info to intel_runtime_info, but overlooked some of our >>platforms initializing device info .display = {}. This is significant, >>as pipe_mask is the single point of truth for a device having a display >>or not; the platforms in question left pipe_mask to whatever was set for >>the platforms they "inherit" from in the complex macro scheme we have. >> >>Add new NO_DISPLAY macro initializing .__runtime.pipe_mask = 0, which >>will cause the device info .display sub-struct to be zeroed in >>intel_device_info_runtime_init(). A better solution (or simply audit of >>proper use of HAS_DISPLAY() checks) is required before moving forward >>with [1]. >> >>Also clear all the display related members in runtime info if there's no >>display. The latter is a bit tedious, but it's for completeness at this >>time, to ensure similar functionality as before. >> >>[1] https://lore.kernel.org/r/dfda1bf67f02ceb07c280b7a13216405fd1f7a34.1660137416.git.jani.nikula@intel.com >> >>Fixes: 00c6cbfd4e8a ("drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info") >>Cc: Lucas De Marchi >>Cc: Maarten Lankhort >>Signed-off-by: Jani Nikula >>--- >> drivers/gpu/drm/i915/i915_pci.c | 11 ++++++----- >> drivers/gpu/drm/i915/intel_device_info.c | 6 ++++++ >> 2 files changed, 12 insertions(+), 5 deletions(-) >> >>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >>index 77e7df21f539..cd4487a1d3be 100644 >>--- a/drivers/gpu/drm/i915/i915_pci.c >>+++ b/drivers/gpu/drm/i915/i915_pci.c >>@@ -41,6 +41,8 @@ >> .__runtime.media.ip.ver = (x), \ >> .__runtime.display.ip.ver = (x) >> >>+#define NO_DISPLAY .__runtime.pipe_mask = 0 >>+ >> #define I845_PIPE_OFFSETS \ >> .display.pipe_offsets = { \ >> [TRANSCODER_A] = PIPE_A_OFFSET, \ >>@@ -519,9 +521,8 @@ static const struct intel_device_info ivb_m_gt2_info = { >> static const struct intel_device_info ivb_q_info = { >> GEN7_FEATURES, >> PLATFORM(INTEL_IVYBRIDGE), >>+ NO_DISPLAY, >> .gt = 2, >>- .__runtime.pipe_mask = 0, /* legal, last one wins */ >>- .__runtime.cpu_transcoder_mask = 0, >> .has_l3_dpf = 1, >> }; >> >>@@ -1039,7 +1040,7 @@ static const struct intel_device_info xehpsdv_info = { >> XE_HPM_FEATURES, >> DGFX_FEATURES, >> PLATFORM(INTEL_XEHPSDV), >>- .display = { }, >>+ NO_DISPLAY, >> .has_64k_pages = 1, >> .needs_compact_pt = 1, >> .has_media_ratio_mode = 1, >>@@ -1081,7 +1082,7 @@ static const struct intel_device_info dg2_info = { >> >> static const struct intel_device_info ats_m_info = { >> DG2_FEATURES, >>- .display = { 0 }, >>+ NO_DISPLAY, >> .require_force_probe = 1, >> .tuning_thread_rr_after_dep = 1, >> }; >>@@ -1103,7 +1104,7 @@ static const struct intel_device_info pvc_info = { >> .__runtime.graphics.ip.rel = 60, >> .__runtime.media.ip.rel = 60, >> PLATFORM(INTEL_PONTEVECCHIO), >>- .display = { 0 }, >>+ NO_DISPLAY, >> .has_flat_ccs = 0, >> .__runtime.platform_engine_mask = >> BIT(BCS0) | >>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c >>index 1434dc33cf49..20575eb77ea7 100644 >>--- a/drivers/gpu/drm/i915/intel_device_info.c >>+++ b/drivers/gpu/drm/i915/intel_device_info.c >>@@ -433,8 +433,14 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) >> dev_priv->drm.driver_features &= ~(DRIVER_MODESET | >> DRIVER_ATOMIC); >> memset(&info->display, 0, sizeof(info->display)); >>+ >>+ runtime->cpu_transcoder_mask = 0; >> memset(runtime->num_sprites, 0, sizeof(runtime->num_sprites)); >> memset(runtime->num_scalers, 0, sizeof(runtime->num_scalers)); >>+ runtime->fbc_mask = 0; >>+ runtime->has_hdcp = false; >>+ runtime->has_dmc = false; >>+ runtime->has_dsc = false; > > why are these not inside __runtime.display? The short answer, because there isn't one. It's an anonymous struct for now. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center