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 AA67BC00A5A for ; Thu, 19 Jan 2023 15:24:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A7D5710E97B; Thu, 19 Jan 2023 15:24:18 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0223010E97B for ; Thu, 19 Jan 2023 15:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674141857; x=1705677857; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=E6g7UryTxmfwQSwLTyZFYl6DFbFxbPxn1ckb3ekFg18=; b=c1ey1x1Z1aetfVgSxHUjoIZpwiupoN86zRd/LRJu6R2sLC/LsVHfQ2De 1zbo/JXLHTDewsElIL3JNdNmMthW1qE0U4UMo4J/t6/Y2OMv/fiK6+K/W QLDPZ49GFQUBSGRXegrrtYQNS4Nqchw5flx+yoVqcyPxPjc4iq5wQYE4Z bEeoZkPceG2AXpVrslJKAM6HHNO+TsC9my+JTPoX6UnBNBAUWmDI3dbLw Lr1G+rQIyRA8/8uxPLruuKbcty2x9GPHNuimg4zWFhHn3QngpBXLZ+h+I Ud7SWzUAgKJhuJoyWNlN+QLE7752Io8i/b/zGgQl6yqWZNWMmsd1voOCK w==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="387675322" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="387675322" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 07:16:15 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="728725418" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="728725418" Received: from nirmoyda-mobl.ger.corp.intel.com (HELO [10.249.46.88]) ([10.249.46.88]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 07:15:49 -0800 Message-ID: <9c32fe7a-3e63-c36d-0483-26383c47d635@linux.intel.com> Date: Thu, 19 Jan 2023 16:15:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: Andrzej Hajda , Nirmoy Das , intel-gfx@lists.freedesktop.org References: <20230119095808.28004-1-nirmoy.das@intel.com> From: "Das, Nirmoy" In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs 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: Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 1/19/2023 3:06 PM, Andrzej Hajda wrote: > On 19.01.2023 10:58, Nirmoy Das wrote: >> For i915 functions pass struct drm_i915_private directly instead of >> struct drm_device. >> >> Cc: Rodrigo Vivi >> Suggested-by: Jani Nikula >> Signed-off-by: Nirmoy Das > > It could be good start for boring refactoring :) of similar cases, for > example: > intel_fbdev_restore_mode > intel_fbdev_set_suspend > Ah I missed those. I was mostly looked into the intel_display.c. I can send another one. > Reviewed-by: Andrzej Hajda Thanks, Nirmoy > > > Regards > Andrzej > > >> --- >>   drivers/gpu/drm/i915/display/intel_display.c | 2 +- >>   drivers/gpu/drm/i915/display/intel_fbdev.c   | 8 ++++---- >>   drivers/gpu/drm/i915/display/intel_fbdev.h   | 8 ++++---- >>   drivers/gpu/drm/i915/i915_driver.c           | 4 +++- >>   4 files changed, 12 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c >> b/drivers/gpu/drm/i915/display/intel_display.c >> index c38a54efedbe..7584f65c6a7e 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.c >> +++ b/drivers/gpu/drm/i915/display/intel_display.c >> @@ -8999,7 +8999,7 @@ void intel_display_driver_register(struct >> drm_i915_private *i915) >>        * enabled. We do it last so that the async config cannot run >>        * before the connectors are registered. >>        */ >> -    intel_fbdev_initial_config_async(&i915->drm); >> +    intel_fbdev_initial_config_async(i915); >>         /* >>        * We need to coordinate the hotplugs with the asynchronous >> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c >> b/drivers/gpu/drm/i915/display/intel_fbdev.c >> index 19f3b5d92a55..c2c52f8e5887 100644 >> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c >> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c >> @@ -547,9 +547,9 @@ static void intel_fbdev_initial_config(void >> *data, async_cookie_t cookie) >> intel_fbdev_unregister(to_i915(ifbdev->helper.dev)); >>   } >>   -void intel_fbdev_initial_config_async(struct drm_device *dev) >> +void intel_fbdev_initial_config_async(struct drm_i915_private >> *dev_priv) >>   { >> -    struct intel_fbdev *ifbdev = to_i915(dev)->display.fbdev.fbdev; >> +    struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev; >>         if (!ifbdev) >>           return; >> @@ -686,9 +686,9 @@ void intel_fbdev_output_poll_changed(struct >> drm_device *dev) >>           drm_fb_helper_hotplug_event(&ifbdev->helper); >>   } >>   -void intel_fbdev_restore_mode(struct drm_device *dev) >> +void intel_fbdev_restore_mode(struct drm_i915_private *dev_priv) >>   { >> -    struct intel_fbdev *ifbdev = to_i915(dev)->display.fbdev.fbdev; >> +    struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev; >>         if (!ifbdev) >>           return; >> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.h >> b/drivers/gpu/drm/i915/display/intel_fbdev.h >> index 0e95e9472fa3..04fd523a5023 100644 >> --- a/drivers/gpu/drm/i915/display/intel_fbdev.h >> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.h >> @@ -15,12 +15,12 @@ struct intel_framebuffer; >>     #ifdef CONFIG_DRM_FBDEV_EMULATION >>   int intel_fbdev_init(struct drm_device *dev); >> -void intel_fbdev_initial_config_async(struct drm_device *dev); >> +void intel_fbdev_initial_config_async(struct drm_i915_private >> *dev_priv); >>   void intel_fbdev_unregister(struct drm_i915_private *dev_priv); >>   void intel_fbdev_fini(struct drm_i915_private *dev_priv); >>   void intel_fbdev_set_suspend(struct drm_device *dev, int state, >> bool synchronous); >>   void intel_fbdev_output_poll_changed(struct drm_device *dev); >> -void intel_fbdev_restore_mode(struct drm_device *dev); >> +void intel_fbdev_restore_mode(struct drm_i915_private *dev_priv); >>   struct intel_framebuffer *intel_fbdev_framebuffer(struct >> intel_fbdev *fbdev); >>   #else >>   static inline int intel_fbdev_init(struct drm_device *dev) >> @@ -28,7 +28,7 @@ static inline int intel_fbdev_init(struct >> drm_device *dev) >>       return 0; >>   } >>   -static inline void intel_fbdev_initial_config_async(struct >> drm_device *dev) >> +static inline void intel_fbdev_initial_config_async(struct >> drm_i915_private *dev_priv) >>   { >>   } >>   @@ -48,7 +48,7 @@ static inline void >> intel_fbdev_output_poll_changed(struct drm_device *dev) >>   { >>   } >>   -static inline void intel_fbdev_restore_mode(struct drm_device *dev) >> +static inline void intel_fbdev_restore_mode(struct drm_i915_private >> *i915) >>   { >>   } >>   static inline struct intel_framebuffer >> *intel_fbdev_framebuffer(struct intel_fbdev *fbdev) >> diff --git a/drivers/gpu/drm/i915/i915_driver.c >> b/drivers/gpu/drm/i915/i915_driver.c >> index 6469c7c1e154..cd6069c1762d 100644 >> --- a/drivers/gpu/drm/i915/i915_driver.c >> +++ b/drivers/gpu/drm/i915/i915_driver.c >> @@ -1071,7 +1071,9 @@ static int i915_driver_open(struct drm_device >> *dev, struct drm_file *file) >>    */ >>   static void i915_driver_lastclose(struct drm_device *dev) >>   { >> -    intel_fbdev_restore_mode(dev); >> +    struct drm_i915_private *i915 = to_i915(dev); >> + >> +    intel_fbdev_restore_mode(i915); >>         vga_switcheroo_process_delayed_switch(); >>   } >