[1/3] drm/amdgpu: Drop DRIVER_USE_AGP

Commit Message

Daniel Vetter Feb. 22, 2020, 5:54 p.m. UTC

This doesn't do anything except auto-init drm_agp support when you
call drm_get_pci_dev(). Which amdgpu stopped doing with

commit b58c11314a1706bf094c489ef5cb28f76478c704
Author: Alex Deucher <[e-mail]>
Date:   Fri Jun 2 17:16:31 2017 -0400

    drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev

No idea whether this was intentional or accidental breakage, but I
guess anyone who manages to boot a this modern gpu behind an agp
bridge deserves a price. A price I never expect anyone to ever collect
:-)

Cc: Alex Deucher <[e-mail]>
Cc: "Christian König" <[e-mail]>
Cc: Hawking Zhang <[e-mail]>
Cc: Xiaojie Yuan <[e-mail]>
Cc: Evan Quan <[e-mail]>
Cc: "Tianci.Yin" <[e-mail]>
Cc: "Marek Olšák" <[e-mail]>
Cc: Hans de Goede <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Emil Velikov Feb. 24, 2020, 3:30 p.m. UTC | #1

On Sat, 22 Feb 2020 at 17:54, Daniel Vetter <[e-mail]> wrote:
>
> This doesn't do anything except auto-init drm_agp support when you
> call drm_get_pci_dev(). Which amdgpu stopped doing with
>
> commit b58c11314a1706bf094c489ef5cb28f76478c704
> Author: Alex Deucher <[e-mail]>
> Date:   Fri Jun 2 17:16:31 2017 -0400
>
>     drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev
>
> No idea whether this was intentional or accidental breakage, but I
> guess anyone who manages to boot a this modern gpu behind an agp
> bridge deserves a price. A price I never expect anyone to ever collect
> :-)
>
> Cc: Alex Deucher <[e-mail]>
> Cc: "Christian König" <[e-mail]>
> Cc: Hawking Zhang <[e-mail]>
> Cc: Xiaojie Yuan <[e-mail]>
> Cc: Evan Quan <[e-mail]>
> Cc: "Tianci.Yin" <[e-mail]>
> Cc: "Marek Olšák" <[e-mail]>
> Cc: Hans de Goede <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>

I've had this patch locally for ages, but never sent it out:

Reviewed-by: Emil Velikov <[e-mail]>

-Emil

Alex Deucher Feb. 24, 2020, 4:10 p.m. UTC | #2

On Sat, Feb 22, 2020 at 12:54 PM Daniel Vetter <[e-mail]> wrote:
>
> This doesn't do anything except auto-init drm_agp support when you
> call drm_get_pci_dev(). Which amdgpu stopped doing with
>
> commit b58c11314a1706bf094c489ef5cb28f76478c704
> Author: Alex Deucher <[e-mail]>
> Date:   Fri Jun 2 17:16:31 2017 -0400
>
>     drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev
>
> No idea whether this was intentional or accidental breakage, but I
> guess anyone who manages to boot a this modern gpu behind an agp
> bridge deserves a price. A price I never expect anyone to ever collect
> :-)
>
> Cc: Alex Deucher <[e-mail]>
> Cc: "Christian König" <[e-mail]>
> Cc: Hawking Zhang <[e-mail]>
> Cc: Xiaojie Yuan <[e-mail]>
> Cc: Evan Quan <[e-mail]>
> Cc: "Tianci.Yin" <[e-mail]>
> Cc: "Marek Olšák" <[e-mail]>
> Cc: Hans de Goede <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>

Series is:
Reviewed-by: Alex Deucher <[e-mail]>
I'm happy to take the patches through my tree or drm-misc.

Alex


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 4598836c5fa4..6cea92017109 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1379,7 +1379,7 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
>
>  static struct drm_driver kms_driver = {
>         .driver_features =
> -           DRIVER_USE_AGP | DRIVER_ATOMIC |
> +           DRIVER_ATOMIC |
>             DRIVER_GEM |
>             DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
>             DRIVER_SYNCOBJ_TIMELINE,
> --
> 2.24.1
>
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Daniel Vetter Feb. 24, 2020, 8:43 p.m. UTC | #3

On Mon, Feb 24, 2020 at 5:10 PM Alex Deucher <[e-mail]> wrote:
>
> On Sat, Feb 22, 2020 at 12:54 PM Daniel Vetter <[e-mail]> wrote:
> >
> > This doesn't do anything except auto-init drm_agp support when you
> > call drm_get_pci_dev(). Which amdgpu stopped doing with
> >
> > commit b58c11314a1706bf094c489ef5cb28f76478c704
> > Author: Alex Deucher <[e-mail]>
> > Date:   Fri Jun 2 17:16:31 2017 -0400
> >
> >     drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev
> >
> > No idea whether this was intentional or accidental breakage, but I
> > guess anyone who manages to boot a this modern gpu behind an agp
> > bridge deserves a price. A price I never expect anyone to ever collect
> > :-)
> >
> > Cc: Alex Deucher <[e-mail]>
> > Cc: "Christian König" <[e-mail]>
> > Cc: Hawking Zhang <[e-mail]>
> > Cc: Xiaojie Yuan <[e-mail]>
> > Cc: Evan Quan <[e-mail]>
> > Cc: "Tianci.Yin" <[e-mail]>
> > Cc: "Marek Olšák" <[e-mail]>
> > Cc: Hans de Goede <[e-mail]>
> > Signed-off-by: Daniel Vetter <[e-mail]>
>
> Series is:
> Reviewed-by: Alex Deucher <[e-mail]>
> I'm happy to take the patches through my tree or drm-misc.

I don't have anything building on top of this, just random things from
my tree. Reason I sent it out is Laurent's series to make a const
drm_driver possible, but I don't think they'll conflict. So amd trees
for the series is perfectly fine and probably simplest.
-Daniel

>
> Alex
>
>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > index 4598836c5fa4..6cea92017109 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > @@ -1379,7 +1379,7 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
> >
> >  static struct drm_driver kms_driver = {
> >         .driver_features =
> > -           DRIVER_USE_AGP | DRIVER_ATOMIC |
> > +           DRIVER_ATOMIC |
> >             DRIVER_GEM |
> >             DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
> >             DRIVER_SYNCOBJ_TIMELINE,
> > --
> > 2.24.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > [e-mail]
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel

Alex Deucher Feb. 25, 2020, 3:16 p.m. UTC | #4

On Mon, Feb 24, 2020 at 3:43 PM Daniel Vetter <[e-mail]> wrote:
>
> On Mon, Feb 24, 2020 at 5:10 PM Alex Deucher <[e-mail]> wrote:
> >
> > On Sat, Feb 22, 2020 at 12:54 PM Daniel Vetter <[e-mail]> wrote:
> > >
> > > This doesn't do anything except auto-init drm_agp support when you
> > > call drm_get_pci_dev(). Which amdgpu stopped doing with
> > >
> > > commit b58c11314a1706bf094c489ef5cb28f76478c704
> > > Author: Alex Deucher <[e-mail]>
> > > Date:   Fri Jun 2 17:16:31 2017 -0400
> > >
> > >     drm/amdgpu: drop deprecated drm_get_pci_dev and drm_put_dev
> > >
> > > No idea whether this was intentional or accidental breakage, but I
> > > guess anyone who manages to boot a this modern gpu behind an agp
> > > bridge deserves a price. A price I never expect anyone to ever collect
> > > :-)
> > >
> > > Cc: Alex Deucher <[e-mail]>
> > > Cc: "Christian König" <[e-mail]>
> > > Cc: Hawking Zhang <[e-mail]>
> > > Cc: Xiaojie Yuan <[e-mail]>
> > > Cc: Evan Quan <[e-mail]>
> > > Cc: "Tianci.Yin" <[e-mail]>
> > > Cc: "Marek Olšák" <[e-mail]>
> > > Cc: Hans de Goede <[e-mail]>
> > > Signed-off-by: Daniel Vetter <[e-mail]>
> >
> > Series is:
> > Reviewed-by: Alex Deucher <[e-mail]>
> > I'm happy to take the patches through my tree or drm-misc.
>
> I don't have anything building on top of this, just random things from
> my tree. Reason I sent it out is Laurent's series to make a const
> drm_driver possible, but I don't think they'll conflict. So amd trees
> for the series is perfectly fine and probably simplest.

Applied.  thanks!

Alex

> -Daniel
>
> >
> > Alex
> >
> >
> > > ---
> > >  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > index 4598836c5fa4..6cea92017109 100644
> > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > > @@ -1379,7 +1379,7 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
> > >
> > >  static struct drm_driver kms_driver = {
> > >         .driver_features =
> > > -           DRIVER_USE_AGP | DRIVER_ATOMIC |
> > > +           DRIVER_ATOMIC |
> > >             DRIVER_GEM |
> > >             DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
> > >             DRIVER_SYNCOBJ_TIMELINE,
> > > --
> > > 2.24.1
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > [e-mail]
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> [phone] - http://blog.ffwll.ch

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 4598836c5fa4..6cea92017109 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1379,7 +1379,7 @@  int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
 
 static struct drm_driver kms_driver = {
 	.driver_features =
-	    DRIVER_USE_AGP | DRIVER_ATOMIC |
+	    DRIVER_ATOMIC |
 	    DRIVER_GEM |
 	    DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
 	    DRIVER_SYNCOBJ_TIMELINE,