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 35832C54E94 for ; Wed, 25 Jan 2023 07:50:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E50610E73A; Wed, 25 Jan 2023 07:50:20 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B35110E73A for ; Wed, 25 Jan 2023 07:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674633018; x=1706169018; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=KqkdoSTN6GHRXc53UQi10HjLnbC3DNQgIIxI2To3wFE=; b=ltJ0jB90X1wfRxiW36LqtaFXIdW+zvSbEbe+vG/UcAcGBY1wcwo44grn FDIhObuJD2ZRkElzUl0tYkPREpqxcyD4uKRB3TNObZTFAMUlJExXldhu8 X+BySHtc6KzSuhio9TOo/P/EkZIiVUwqK8Sc5JJY3nHJGtKfY28S/SdAt nVqIYmR42VNa7IX4UyPZ+Ao4FF4iIzhOK0ts07v4j19URsw+V3IVRxe7W 8cPz1PZijP6GeUfEjRdZIx3WSbE3D6EMUbtXf5zl4XMdfJv3hBJjuqYN3 7oEcphTbhyuhiP2+PDLt/lrG9lNWvYkMc7oYwn6adBgBHkiiEFHr+cAz9 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10600"; a="326532382" X-IronPort-AV: E=Sophos;i="5.97,244,1669104000"; d="scan'208";a="326532382" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2023 23:50:18 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10600"; a="804915411" X-IronPort-AV: E=Sophos;i="5.97,244,1669104000"; d="scan'208";a="804915411" Received: from mglinsk-mobl1.ger.corp.intel.com (HELO [10.213.31.78]) ([10.213.31.78]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2023 23:50:16 -0800 Message-ID: Date: Wed, 25 Jan 2023 08:50:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.6.1 Content-Language: en-US To: Nirmoy Das , intel-gfx@lists.freedesktop.org References: <20230124141740.17601-1-nirmoy.das@intel.com> From: Andrzej Hajda Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20230124141740.17601-1-nirmoy.das@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: Jani Nikula , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 24.01.2023 15:17, 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 > Reviewed-by: Jani Nikula > Reviewed-by: Andrzej Hajda > --- > 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 e37cca6b18c6..b014d8626ef7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -9004,7 +9004,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); You could use to_i915(dev) without alias. Reviewed-by: Andrzej Hajda Regards Andrzej > > vga_switcheroo_process_delayed_switch(); > }