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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 34996C432BE for ; Wed, 1 Sep 2021 17:04:48 +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 F421061053 for ; Wed, 1 Sep 2021 17:04:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F421061053 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 5FCA76E21C; Wed, 1 Sep 2021 17:04:47 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E51C6E21C for ; Wed, 1 Sep 2021 17:04:45 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10094"; a="218864746" X-IronPort-AV: E=Sophos;i="5.84,369,1620716400"; d="scan'208";a="218864746" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2021 10:03:35 -0700 X-IronPort-AV: E=Sophos;i="5.84,369,1620716400"; d="scan'208";a="541914487" Received: from josearun-mobl1.gar.corp.intel.com (HELO localhost) ([10.251.212.211]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2021 10:03:32 -0700 From: Jani Nikula To: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Wed, 01 Sep 2021 20:03:29 +0300 Message-ID: <87tuj49qji.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() 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, 01 Sep 2021, Rodrigo Vivi wrote: > On Mon, Aug 30, 2021 at 03:53:44PM +0300, Jani Nikula wrote: >> Prefer the intel_ types. No functional changes. >> >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/display/intel_connector.c | 2 +- >> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++- >> drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++-- >> 3 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c >> index 4f49d782eca2..c65f95a9a1ec 100644 >> --- a/drivers/gpu/drm/i915/display/intel_connector.c >> +++ b/drivers/gpu/drm/i915/display/intel_connector.c >> @@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector) > > oh, actually this is drm_connector > >> goto err_backlight; >> } >> >> - intel_connector_debugfs_add(connector); >> + intel_connector_debugfs_add(intel_connector); > > so this fails... Hence the v2 :) > >> >> return 0; >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> index 845e2dc76f87..82043a71e91f 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> @@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = { >> * Cleanup will be done by drm_connector_unregister() through a call to >> * drm_debugfs_connector_remove(). >> */ >> -void intel_connector_debugfs_add(struct drm_connector *connector) >> +void intel_connector_debugfs_add(struct intel_connector *intel_connector) >> { >> + struct drm_connector *connector = &intel_connector->base; >> struct dentry *root = connector->debugfs_entry; >> struct drm_i915_private *dev_priv = to_i915(connector->dev); >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h >> index c72e35ecba1f..9b89b707ffe6 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h >> @@ -6,9 +6,9 @@ >> #ifndef __INTEL_DISPLAY_DEBUGFS_H__ >> #define __INTEL_DISPLAY_DEBUGFS_H__ >> >> -struct drm_connector; >> struct drm_crtc; >> struct drm_i915_private; >> +struct intel_connector; >> >> #ifdef CONFIG_DEBUG_FS >> void intel_display_debugfs_register(struct drm_i915_private *i915); >> @@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector); >> void intel_crtc_debugfs_add(struct drm_crtc *crtc); >> #else >> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {} >> -static inline void intel_connector_debugfs_add(struct drm_connector *connector) {} >> +static inline void intel_connector_debugfs_add(struct intel_connector *connector) {} >> static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {} >> #endif >> >> -- >> 2.20.1 >> -- Jani Nikula, Intel Open Source Graphics Center