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 967F4C001CC for ; Wed, 17 Apr 2024 09:54:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 289BE11335E; Wed, 17 Apr 2024 09:54:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XmGDcEGB"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id B191C11335C; Wed, 17 Apr 2024 09:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713347646; x=1744883646; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=jQL9rLPW8AxP/n5YLr3iMBDOCIw1ESXtIkCaKIx0YrU=; b=XmGDcEGBMeIc/tAXkFDmt4WCrTHsfvFUKWmNFK6nfxHZUDmwmEvyiO+j oiqdHRL/4keGJCo7Vu9J0wS66qVClgtdDbZAFs/fxWzNqMiVOPc9g6hsL zek/E3e3ZfIEZrKfmkLTgtc+goHgCvsvG0+ImxE4jpsWCf7gpMaPpXNbD bCzczdSj4LUNs1clYt5Mwzxeooyankm8Oq4X5QFoXAw9FcEUtgxfsILxg SGGvU0rYGBb/6m2tIqd/N7To9J8PDPWwyc/uEMQwzJBPktYUPpEPlb43L zIwCBqVCwV0jUkVmFLDJCvMpGd8uyY8lNA8XmiOMiWSaEFdJRUL45flpO Q==; X-CSE-ConnectionGUID: vuYKpih/Qj+ZjAiZqOjmSw== X-CSE-MsgGUID: 988P7YhgRbOB5jsfos+HYA== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26292258" X-IronPort-AV: E=Sophos;i="6.07,208,1708416000"; d="scan'208";a="26292258" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2024 02:54:05 -0700 X-CSE-ConnectionGUID: AfMa0KQITzeIdlOX1FjIjQ== X-CSE-MsgGUID: pmkHU82LRyCGL4aBH+N1ig== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,208,1708416000"; d="scan'208";a="27357476" Received: from vpus-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.45.164]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2024 02:54:02 -0700 From: Jani Nikula To: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, lucas.demarchi@intel.com, ville.syrjala@linux.intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net Subject: Re: [PATCH v3 4/7] drm/xe/display: add generic __to_intel_display() In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <503fea3fc545bebe6aa303d33cb5e816f7738343.1712665176.git.jani.nikula@intel.com> Date: Wed, 17 Apr 2024 12:53:59 +0300 Message-ID: <87sezkxqko.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Tue, 16 Apr 2024, Rodrigo Vivi wrote: > On Tue, Apr 09, 2024 at 03:26:46PM +0300, Jani Nikula wrote: >> Add generic __to_intel_display() macro that accepts either struct >> xe_device * or struct intel_display *. This is to be used for >> transitional stuff that eventually needs to be converted to use struct >> intel_display *, and therefore is not part of to_intel_display(). >> >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> index 2792a497257e..4448eda8b2a4 100644 >> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >> @@ -29,6 +29,17 @@ >> #include "intel_runtime_pm.h" >> #include >> >> +/* >> + * Transitional macro to optionally convert struct xe_device * to struct >> + * intel_display *, also accepting the latter. >> + */ >> +#define __to_intel_display(p) \ >> + _Generic(p, \ >> + const struct xe_device *: (&((const struct xe_device *)(p))->display), \ >> + struct xe_device *: (&((struct xe_device *)(p))->display), \ >> + const struct intel_display *: (p), \ >> + struct intel_display *: (p)) > > hmmm... I thought that with our make magic we didn't need this. > but well, at least more awareness and trying to get rid of the make magic > earlier? It's needed because in i915 I wanted to put this in i915_drv.h to not create a extra dependency to/from i915_drv.h. I tried, it gets tricky. So weed another copy xe side. The make magic does convert all struct drm_i915_private to struct xe_device, so this could have struct drm_i915_private, but the other copy is not available here. BR, Jani. > > Reviewed-by: Rodrigo Vivi > >> + >> static inline struct drm_i915_private *to_i915(const struct drm_device *dev) >> { >> return container_of(dev, struct drm_i915_private, drm); >> -- >> 2.39.2 >> -- Jani Nikula, Intel