From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: <javierm@redhat.com>, <daniel@ffwll.ch>,
<maarten.lankhorst@linux.intel.com>, <mripard@kernel.org>,
<inki.dae@samsung.com>, <sw0312.kim@samsung.com>,
<kyungmin.park@samsung.com>, <linux@armlinux.org.uk>,
<krzk@kernel.org>, <alim.akhtar@samsung.com>,
<patrik.r.jakobsson@gmail.com>, <jani.nikula@linux.intel.com>,
<joonas.lahtinen@linux.intel.com>, <tursulin@ursulin.net>,
<robdclark@gmail.com>, <quic_abhinavk@quicinc.com>,
<dmitry.baryshkov@linaro.org>, <sean@poorly.run>,
<marijn.suijten@somainline.org>,
<tomi.valkeinen@ideasonboard.com>, <alexander.deucher@amd.com>,
<christian.koenig@amd.com>, <Xinhui.Pan@amd.com>,
<thierry.reding@gmail.com>, <mperttunen@nvidia.com>,
<jonathanh@nvidia.com>, <dri-devel@lists.freedesktop.org>,
<intel-gfx@lists.freedesktop.org>,
<amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 08/11] drm/i915: Use drm_fbdev_helper_client_unregister()
Date: Tue, 7 May 2024 08:25:37 -0400 [thread overview]
Message-ID: <ZjodweGCM0_zd2L0@intel.com> (raw)
In-Reply-To: <20240507120422.25492-9-tzimmermann@suse.de>
On Tue, May 07, 2024 at 01:58:29PM +0200, Thomas Zimmermann wrote:
> Implement struct drm_client_funcs.unregister with the helpers
> drm_fbdev_helper_client_unregister() and remove the custom code
> from the driver. The generic helper is equivalent in functionality.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/i915/display/intel_fbdev.c | 21 ++-------------------
> 1 file changed, 2 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index bda702c2cab8e..f1b4543bffc02 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -38,7 +38,6 @@
> #include <linux/vga_switcheroo.h>
>
> #include <drm/drm_crtc.h>
> -#include <drm/drm_crtc_helper.h>
> #include <drm/drm_fb_helper.h>
> #include <drm/drm_fourcc.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> @@ -580,25 +579,9 @@ static int intel_fbdev_restore_mode(struct drm_i915_private *dev_priv)
> }
>
> /*
> - * Fbdev client and struct drm_client_funcs
> + * struct drm_client_funcs
> */
>
> -static void intel_fbdev_client_unregister(struct drm_client_dev *client)
> -{
> - struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
> - struct drm_device *dev = fb_helper->dev;
> - struct pci_dev *pdev = to_pci_dev(dev->dev);
> -
> - if (fb_helper->info) {
> - vga_switcheroo_client_fb_set(pdev, NULL);
> - drm_fb_helper_unregister_info(fb_helper);
> - } else {
> - drm_fb_helper_unprepare(fb_helper);
> - drm_client_release(&fb_helper->client);
The only real difference is that these 2 calls are inverted in the new
drm_fbdev_helper_client_unregister.
I feel that the releasing after the unprepare sounds more logical,
but if there's no actual issue with that and it is working for
everybody, let's do that.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(to get through drm-misc with everything else if you prefer)
> - kfree(fb_helper);
> - }
> -}
> -
> static int intel_fbdev_client_restore(struct drm_client_dev *client)
> {
> struct drm_i915_private *dev_priv = to_i915(client->dev);
> @@ -644,7 +627,7 @@ static int intel_fbdev_client_hotplug(struct drm_client_dev *client)
>
> static const struct drm_client_funcs intel_fbdev_client_funcs = {
> .owner = THIS_MODULE,
> - .unregister = intel_fbdev_client_unregister,
> + .unregister = drm_fbdev_helper_client_unregister,
> .restore = intel_fbdev_client_restore,
> .hotplug = intel_fbdev_client_hotplug,
> };
> --
> 2.44.0
>
next prev parent reply other threads:[~2024-05-07 12:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 11:58 [PATCH 00/11] drm: Provide common fbdev client helpers Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 01/11] drm/fb-helper: Add helpers for struct drm_client_funcs Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 02/11] drm/fbdev-dma: Use fbdev client helpers Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 03/11] drm/fbdev-shmem: " Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 04/11] drm/fbdev-ttm: " Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 05/11] drm/armada: " Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 06/11] drm/exynos: " Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 07/11] drm/gma500: " Thomas Zimmermann
2024-05-08 12:53 ` Patrik Jakobsson
2024-05-07 11:58 ` [PATCH 08/11] drm/i915: Use drm_fbdev_helper_client_unregister() Thomas Zimmermann
2024-05-07 12:25 ` Rodrigo Vivi [this message]
2024-05-07 13:10 ` Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 09/11] drm/msm: Use fbdev client helpers Thomas Zimmermann
2024-05-07 14:36 ` Dmitry Baryshkov
2024-05-07 11:58 ` [PATCH 10/11] drm/omapdrm: " Thomas Zimmermann
2024-05-07 11:58 ` [PATCH 11/11] drm/tegra: " Thomas Zimmermann
2024-05-07 21:03 ` Felix Kuehling
2024-05-08 6:00 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZjodweGCM0_zd2L0@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=Xinhui.Pan@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alim.akhtar@samsung.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=javierm@redhat.com \
--cc=jonathanh@nvidia.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux@armlinux.org.uk \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marijn.suijten@somainline.org \
--cc=mperttunen@nvidia.com \
--cc=mripard@kernel.org \
--cc=patrik.r.jakobsson@gmail.com \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=tursulin@ursulin.net \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).