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 E6548CA1013 for ; Thu, 18 Sep 2025 17:39:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A642810E338; Thu, 18 Sep 2025 17:39:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RV18arYF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7253F10E32C; Thu, 18 Sep 2025 17:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758217155; x=1789753155; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=2TWnibbSPmQcZ+xxIWUZkjeQQ/t2Q70xu/asv6jRYYg=; b=RV18arYFCtCo74RdtSHm5A7sqIdTwaT4LT+uQHSsp91PJydcZgOx3jPf bV/N0+B5d4UYdcocl7uazQCbNn+DpqUoBB+bjV+vhWII8XAlQwDUIGS4P VIZCdmFULxSznNDzy+tCAEx+hc3JMwEbWOKUXmqZ3pIm3MHsCHf/R/EaK 0euxZeTBsbwnBSl/+sQgHmnXwS2t4FZ0L6aUZ9BJjYxvuuw9jqNqhyvLw k/mQbkJeUetMaY8ZqvECpOybHZVk0Sk8e0A+BK/wiLDohNTASG4kb8A0V XmGPxVSbWTNodW39P/R6t6qauZrf+WgKHunF/hLiOLzyC7pCOsc38TALf A==; X-CSE-ConnectionGUID: 38XHI3yGRpyXZ4CtbXbnCg== X-CSE-MsgGUID: wFj9dM8BQMibPtiuZfixtA== X-IronPort-AV: E=McAfee;i="6800,10657,11557"; a="60447235" X-IronPort-AV: E=Sophos;i="6.18,275,1751266800"; d="scan'208";a="60447235" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2025 10:39:15 -0700 X-CSE-ConnectionGUID: kJqgYb60SleIVO3xdOMvNA== X-CSE-MsgGUID: XFot6kWhQQybwHPrYFh1AQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,275,1751266800"; d="scan'208";a="174732799" Received: from pgcooper-mobl3.ger.corp.intel.com (HELO localhost) ([10.245.244.255]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2025 10:39:13 -0700 Date: Thu, 18 Sep 2025 20:39:10 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH v2 03/10] drm/{i915,xe}/fbdev: pass struct drm_device to intel_fbdev_fb_alloc() Message-ID: References: <16360584f80cdc5ee35fd94cfd92fd3955588dfd.1758184771.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <16360584f80cdc5ee35fd94cfd92fd3955588dfd.1758184771.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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 Thu, Sep 18, 2025 at 11:40:53AM +0300, Jani Nikula wrote: > The function doesn't actually need struct drm_fb_helper for anything, > just pass struct drm_device. > > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 10 +++++----- > drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 4 ++-- > drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 7 +++---- > 4 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c > index 7c4709d58aa3..46c6de5f6088 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -237,7 +237,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper, > if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) { > drm_dbg_kms(display->drm, > "no BIOS fb, allocating a new one\n"); > - fb = intel_fbdev_fb_alloc(helper, sizes); > + fb = intel_fbdev_fb_alloc(display->drm, sizes); > if (IS_ERR(fb)) > return PTR_ERR(fb); > } else { > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c > index b9dfd00a7d05..4de13d1a4c7a 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c > @@ -13,11 +13,11 @@ > #include "intel_fb.h" > #include "intel_fbdev_fb.h" > > -struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > +struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm, > struct drm_fb_helper_surface_size *sizes) > { > - struct intel_display *display = to_intel_display(helper->dev); > - struct drm_i915_private *dev_priv = to_i915(display->drm); > + struct intel_display *display = to_intel_display(drm); > + struct drm_i915_private *dev_priv = to_i915(drm); > struct drm_framebuffer *fb; > struct drm_mode_fb_cmd2 mode_cmd = {}; > struct drm_i915_gem_object *obj; > @@ -58,12 +58,12 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > } > > if (IS_ERR(obj)) { > - drm_err(display->drm, "failed to allocate framebuffer (%pe)\n", obj); > + drm_err(drm, "failed to allocate framebuffer (%pe)\n", obj); > return ERR_PTR(-ENOMEM); > } > > fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj), > - drm_get_format_info(display->drm, > + drm_get_format_info(drm, > mode_cmd.pixel_format, > mode_cmd.modifier[0]), > &mode_cmd); > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h > index cb7957272715..668ae355f5e5 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h > +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h > @@ -6,14 +6,14 @@ > #ifndef __INTEL_FBDEV_FB_H__ > #define __INTEL_FBDEV_FB_H__ > > -struct drm_fb_helper; > +struct drm_device; > struct drm_fb_helper_surface_size; > struct drm_gem_object; > struct fb_info; > struct i915_vma; > struct intel_display; > > -struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > +struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm, > struct drm_fb_helper_surface_size *sizes); > int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info *info, > struct drm_gem_object *obj, struct i915_vma *vma); > diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > index bce4cb16f682..5c0874bfa6ab 100644 > --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > +++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > @@ -15,12 +15,11 @@ > > #include > > -struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > +struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm, > struct drm_fb_helper_surface_size *sizes) > { > struct drm_framebuffer *fb; > - struct drm_device *dev = helper->dev; > - struct xe_device *xe = to_xe_device(dev); > + struct xe_device *xe = to_xe_device(drm); > struct drm_mode_fb_cmd2 mode_cmd = {}; > struct xe_bo *obj; > int size; > @@ -67,7 +66,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > } > > fb = intel_framebuffer_create(&obj->ttm.base, > - drm_get_format_info(dev, > + drm_get_format_info(drm, > mode_cmd.pixel_format, > mode_cmd.modifier[0]), > &mode_cmd); > -- > 2.47.3 -- Ville Syrjälä Intel