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 7F0B4C004D4 for ; Thu, 19 Jan 2023 10:58:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD40610E908; Thu, 19 Jan 2023 10:58:58 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D7DA10E908 for ; Thu, 19 Jan 2023 10:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674125936; x=1705661936; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=+wpsVJ01j89rEmkj3XwVT5QeFF3bzHcVgHOxOOpZ5LY=; b=IhsBjbk+ruBD2R7rBgAkuQpUJBbalJWmvb+cRznztoT+/505DXp8KZr7 DLOqtRAyQRo/bPBfp3rB4ML+9W+rT2JUPhXn2nKcmNC/2IMXZbBajOet/ NHW4rNm3LkZJB3A04gG5LhoeN99WjSrVUVGg/RHoOON4jrt8WX+IVrNpv QIWICugX02Zh+lNRK0equuyDQS/ziR4tK7trSgJYX22osyziRST2t7hSi c2peRkOphjL0yxrZi1rAxe/DK5lSnekNi+INuBC9E8dkYSUKAMujGtu2G soglQ+k/LYccGdoOGeIOwGcwUTcD+aC0F6umONJ27L4BzNq5fIO2R0goJ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="304938473" X-IronPort-AV: E=Sophos;i="5.97,228,1669104000"; d="scan'208";a="304938473" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 02:58:55 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="768174079" X-IronPort-AV: E=Sophos;i="5.97,228,1669104000"; d="scan'208";a="768174079" Received: from unknown (HELO localhost) ([10.237.66.157]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 02:58:52 -0800 From: Jani Nikula To: Nirmoy Das , intel-gfx@lists.freedesktop.org In-Reply-To: <20230119095808.28004-1-nirmoy.das@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230119095808.28004-1-nirmoy.das@intel.com> Date: Thu, 19 Jan 2023 12:58:47 +0200 Message-ID: <87k01iaizc.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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 , Nirmoy Das Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 19 Jan 2023, Nirmoy Das wrote: > For i915 functions pass struct drm_i915_private directly instead of > struct drm_device. Reviewed-by: Jani Nikula but maybe let's wait until we've synced up with drm-misc-next to avoid the unnecessary conflict in drm-tip and linux-next? > > Cc: Rodrigo Vivi > Suggested-by: Jani Nikula > Signed-off-by: Nirmoy Das > --- > 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(); > } -- Jani Nikula, Intel Open Source Graphics Center