drm/amd/display: revert "enable GPU VM support"

Submitted by Christian König on Oct. 30, 2017, 2:55 p.m.

Details

Message ID 1509375358-32528-1-git-send-email-deathsimple@vodafone.de
State New
Headers show
Series "drm/amd/display: revert "enable GPU VM support"" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Christian König Oct. 30, 2017, 2:55 p.m.
From: Christian König <christian.koenig@amd.com>

This reverts commit aa7187c5c640559ebc02caa0191c0db46b55b4a6.

Disable GPU VM support again for now until it doesn't cause a warning on
hardware which doesn't support it.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index c13110f..e6ec130 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -417,8 +417,6 @@  static int amdgpu_dm_init(struct amdgpu_device *adev)
 
 	init_data.dce_environment = DCE_ENV_PRODUCTION_DRV;
 
-	init_data.flags.gpu_vm_support = true;
-
 	if (amdgpu_dc_log)
 		init_data.log_mask = DC_DEFAULT_LOG_MASK;
 	else

Comments

On 2017-10-30 10:55 AM, Christian König wrote:
> From: Christian König <christian.koenig@amd.com>
> 
> This reverts commit aa7187c5c640559ebc02caa0191c0db46b55b4a6.
> 
> Disable GPU VM support again for now until it doesn't cause a warning on
> hardware which doesn't support it.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

I'll still try to hack DC to not blow up with this after which we can bring this back. Hopefully by end of the week.

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index c13110f..e6ec130 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -417,8 +417,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>  
>  	init_data.dce_environment = DCE_ENV_PRODUCTION_DRV;
>  
> -	init_data.flags.gpu_vm_support = true;
> -
>  	if (amdgpu_dc_log)
>  		init_data.log_mask = DC_DEFAULT_LOG_MASK;
>  	else
>
> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf

> Of Harry Wentland

> Sent: Monday, October 30, 2017 11:02 AM

> To: Christian König; amd-gfx@lists.freedesktop.org

> Subject: Re: [PATCH] drm/amd/display: revert "enable GPU VM support"

> 

> On 2017-10-30 10:55 AM, Christian König wrote:

> > From: Christian König <christian.koenig@amd.com>

> >

> > This reverts commit aa7187c5c640559ebc02caa0191c0db46b55b4a6.

> >

> > Disable GPU VM support again for now until it doesn't cause a warning on

> > hardware which doesn't support it.

> >

> > Signed-off-by: Christian König <christian.koenig@amd.com>

> 

> Reviewed-by: Harry Wentland <harry.wentland@amd.com>

> 

> I'll still try to hack DC to not blow up with this after which we can bring this

> back. Hopefully by end of the week.


In the short term, can't we do something like:

if (adev->flags & AMDGPU_IS_APU && adev->asic_type >= CHIP_CARRIZO)
    init_data.flags.gpu_vm_support = true;

Alex

> 

> Harry

> 

> > ---

> >  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --

> >  1 file changed, 2 deletions(-)

> >

> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

> > index c13110f..e6ec130 100644

> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

> > @@ -417,8 +417,6 @@ static int amdgpu_dm_init(struct amdgpu_device

> *adev)

> >

> >  	init_data.dce_environment = DCE_ENV_PRODUCTION_DRV;

> >

> > -	init_data.flags.gpu_vm_support = true;

> > -

> >  	if (amdgpu_dc_log)

> >  		init_data.log_mask = DC_DEFAULT_LOG_MASK;

> >  	else

> >

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx