From: Sam Ravnborg <sam@ravnborg.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm: Make drm_pci_agp_init legacy
Date: Sat, 7 Mar 2020 11:13:40 +0100 [thread overview]
Message-ID: <20200307101340.GA32190@ravnborg.org> (raw)
In-Reply-To: <20200307093702.2269-1-chris@chris-wilson.co.uk>
Hi Chris.
On Sat, Mar 07, 2020 at 09:37:02AM +0000, Chris Wilson wrote:
> Pull the drm_pci_agp_init() underneath the legacy ifdeffry alongside its
> only caller.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
I dunno this code - but patch is obviously correct.
This diff is a bit weird as it shows that another function is moved.
But it makes sense looking at drm_pci.c
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/drm_pci.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 5218475ad7e7..81aa21561982 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -166,6 +166,18 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
> return drm_pci_irq_by_busid(dev, p);
> }
>
> +void drm_pci_agp_destroy(struct drm_device *dev)
> +{
> + if (dev->agp) {
> + arch_phys_wc_del(dev->agp->agp_mtrr);
> + drm_legacy_agp_clear(dev);
> + kfree(dev->agp);
> + dev->agp = NULL;
> + }
> +}
> +
> +#ifdef CONFIG_DRM_LEGACY
> +
> static void drm_pci_agp_init(struct drm_device *dev)
> {
> if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
> @@ -180,18 +192,6 @@ static void drm_pci_agp_init(struct drm_device *dev)
> }
> }
>
> -void drm_pci_agp_destroy(struct drm_device *dev)
> -{
> - if (dev->agp) {
> - arch_phys_wc_del(dev->agp->agp_mtrr);
> - drm_legacy_agp_clear(dev);
> - kfree(dev->agp);
> - dev->agp = NULL;
> - }
> -}
> -
> -#ifdef CONFIG_DRM_LEGACY
> -
> static int drm_get_pci_dev(struct pci_dev *pdev,
> const struct pci_device_id *ent,
> struct drm_driver *driver)
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-03-07 10:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-07 9:37 [PATCH] drm: Make drm_pci_agp_init legacy Chris Wilson
2020-03-07 10:13 ` Sam Ravnborg [this message]
2020-03-09 7:43 ` 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=20200307101340.GA32190@ravnborg.org \
--to=sam@ravnborg.org \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.