* [PATCH] drm/amdgpu: enable amdgpu_dc module parameter
@ 2022-01-20 6:25 Lang Yu
2022-01-20 17:35 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Lang Yu @ 2022-01-20 6:25 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Huang Rui, Lang Yu
It doesn't work under IP discovery mode. Make it work!
Signed-off-by: Lang Yu <Lang.Yu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 07965ac6381b..1ad137499e38 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -846,8 +846,14 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
{
if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) {
amdgpu_device_ip_block_add(adev, &amdgpu_vkms_ip_block);
+ return 0;
+ }
+
+ if (!amdgpu_device_has_dc_support(adev))
+ return 0;
+
#if defined(CONFIG_DRM_AMD_DC)
- } else if (adev->ip_versions[DCE_HWIP][0]) {
+ if (adev->ip_versions[DCE_HWIP][0]) {
switch (adev->ip_versions[DCE_HWIP][0]) {
case IP_VERSION(1, 0, 0):
case IP_VERSION(1, 0, 1):
@@ -882,9 +888,9 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
adev->ip_versions[DCI_HWIP][0]);
return -EINVAL;
}
-#endif
}
return 0;
+#endif
}
static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu: enable amdgpu_dc module parameter
2022-01-20 6:25 [PATCH] drm/amdgpu: enable amdgpu_dc module parameter Lang Yu
@ 2022-01-20 17:35 ` Alex Deucher
2022-01-21 2:32 ` Lang Yu
0 siblings, 1 reply; 3+ messages in thread
From: Alex Deucher @ 2022-01-20 17:35 UTC (permalink / raw)
To: Lang Yu; +Cc: Alex Deucher, Huang Rui, amd-gfx list
On Thu, Jan 20, 2022 at 1:25 AM Lang Yu <Lang.Yu@amd.com> wrote:
>
> It doesn't work under IP discovery mode. Make it work!
>
> Signed-off-by: Lang Yu <Lang.Yu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 07965ac6381b..1ad137499e38 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -846,8 +846,14 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
> {
> if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) {
> amdgpu_device_ip_block_add(adev, &amdgpu_vkms_ip_block);
> + return 0;
> + }
> +
> + if (!amdgpu_device_has_dc_support(adev))
> + return 0;
> +
> #if defined(CONFIG_DRM_AMD_DC)
> - } else if (adev->ip_versions[DCE_HWIP][0]) {
> + if (adev->ip_versions[DCE_HWIP][0]) {
> switch (adev->ip_versions[DCE_HWIP][0]) {
> case IP_VERSION(1, 0, 0):
> case IP_VERSION(1, 0, 1):
> @@ -882,9 +888,9 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
> adev->ip_versions[DCI_HWIP][0]);
> return -EINVAL;
> }
> -#endif
> }
> return 0;
> +#endif
I think the compiler will complain about this. If you move the #endif
before the return, the patch is:
Reviewed-by: Alex Deucher <aleander.deucher@amd.com>
> }
>
> static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu: enable amdgpu_dc module parameter
2022-01-20 17:35 ` Alex Deucher
@ 2022-01-21 2:32 ` Lang Yu
0 siblings, 0 replies; 3+ messages in thread
From: Lang Yu @ 2022-01-21 2:32 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, Huang Rui, amd-gfx list
On 01/20/ , Alex Deucher wrote:
> On Thu, Jan 20, 2022 at 1:25 AM Lang Yu <Lang.Yu@amd.com> wrote:
> >
> > It doesn't work under IP discovery mode. Make it work!
> >
> > Signed-off-by: Lang Yu <Lang.Yu@amd.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 ++++++++--
> > 1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> > index 07965ac6381b..1ad137499e38 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> > @@ -846,8 +846,14 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
> > {
> > if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) {
> > amdgpu_device_ip_block_add(adev, &amdgpu_vkms_ip_block);
> > + return 0;
> > + }
> > +
> > + if (!amdgpu_device_has_dc_support(adev))
> > + return 0;
> > +
> > #if defined(CONFIG_DRM_AMD_DC)
> > - } else if (adev->ip_versions[DCE_HWIP][0]) {
> > + if (adev->ip_versions[DCE_HWIP][0]) {
> > switch (adev->ip_versions[DCE_HWIP][0]) {
> > case IP_VERSION(1, 0, 0):
> > case IP_VERSION(1, 0, 1):
> > @@ -882,9 +888,9 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
> > adev->ip_versions[DCI_HWIP][0]);
> > return -EINVAL;
> > }
> > -#endif
> > }
> > return 0;
> > +#endif
>
> I think the compiler will complain about this. If you move the #endif
> before the return, the patch is:
> Reviewed-by: Alex Deucher <aleander.deucher@amd.com>
Thanks. I got it.
Regards,
Lang
> > }
> >
> > static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-21 2:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-20 6:25 [PATCH] drm/amdgpu: enable amdgpu_dc module parameter Lang Yu
2022-01-20 17:35 ` Alex Deucher
2022-01-21 2:32 ` Lang Yu
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.