All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] drm/radeon: fix compilation error
@ 2021-02-16 15:22 Nirmoy Das
  2021-02-16 15:23 ` Christian König
  2021-02-16 15:24 ` Alex Deucher
  0 siblings, 2 replies; 4+ messages in thread
From: Nirmoy Das @ 2021-02-16 15:22 UTC (permalink / raw)
  To: alexander.deucher; +Cc: Nirmoy Das, Christian.Koenig, amd-gfx, Mark Broadworth

Fixes below compilation error:
conflicting types for ‘r100_debugfs_mc_info_init’

Fixes: 6f8672d6523bfe38e ("drm/radeon: do not use drm middle layer for
debugfs")
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reported-by: Mark Broadworth <Mark.Broadworth@amd.com>
---
Hi Alex,

Can you please squash this with the "Fixes" commit.
I am not sure how I missed it.
I even tested the patch with my radeon card before pushing.

 drivers/gpu/drm/radeon/r300.c        | 6 +-----
 drivers/gpu/drm/radeon/radeon_asic.h | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 03b0d4a81f7a..92643dfdd8a8 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1326,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device *rdev)
 void r300_mc_program(struct radeon_device *rdev)
 {
 	struct r100_mc_save save;
-	int r;

-	r = r100_debugfs_mc_info_init(rdev);
-	if (r) {
-		dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
-	}
+	r100_debugfs_mc_info_init(rdev);

 	/* Stops all mc clients */
 	r100_mc_stop(rdev, &save);
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 2c77f151ef62..1cf2a5e0d91d 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -108,7 +108,7 @@ int r100_pci_gart_init(struct radeon_device *rdev);
 void r100_pci_gart_fini(struct radeon_device *rdev);
 int r100_pci_gart_enable(struct radeon_device *rdev);
 void r100_pci_gart_disable(struct radeon_device *rdev);
-int r100_debugfs_mc_info_init(struct radeon_device *rdev);
+void  r100_debugfs_mc_info_init(struct radeon_device *rdev);
 int r100_gui_wait_for_idle(struct radeon_device *rdev);
 int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring);
 void r100_irq_disable(struct radeon_device *rdev);
--
2.30.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] drm/radeon: fix compilation error
  2021-02-16 15:22 [PATCH 1/1] drm/radeon: fix compilation error Nirmoy Das
@ 2021-02-16 15:23 ` Christian König
  2021-02-16 17:41   ` Nirmoy
  2021-02-16 15:24 ` Alex Deucher
  1 sibling, 1 reply; 4+ messages in thread
From: Christian König @ 2021-02-16 15:23 UTC (permalink / raw)
  To: Nirmoy Das, alexander.deucher; +Cc: Mark Broadworth, amd-gfx



Am 16.02.21 um 16:22 schrieb Nirmoy Das:
> Fixes below compilation error:
> conflicting types for ‘r100_debugfs_mc_info_init’
>
> Fixes: 6f8672d6523bfe38e ("drm/radeon: do not use drm middle layer for
> debugfs")
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reported-by: Mark Broadworth <Mark.Broadworth@amd.com>

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

> ---
> Hi Alex,
>
> Can you please squash this with the "Fixes" commit.
> I am not sure how I missed it.
> I even tested the patch with my radeon card before pushing.

Strange I'm pretty sure I've seen those lines in the original patch.

Christian.

>
>   drivers/gpu/drm/radeon/r300.c        | 6 +-----
>   drivers/gpu/drm/radeon/radeon_asic.h | 2 +-
>   2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 03b0d4a81f7a..92643dfdd8a8 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -1326,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device *rdev)
>   void r300_mc_program(struct radeon_device *rdev)
>   {
>   	struct r100_mc_save save;
> -	int r;
>
> -	r = r100_debugfs_mc_info_init(rdev);
> -	if (r) {
> -		dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
> -	}
> +	r100_debugfs_mc_info_init(rdev);
>
>   	/* Stops all mc clients */
>   	r100_mc_stop(rdev, &save);
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 2c77f151ef62..1cf2a5e0d91d 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -108,7 +108,7 @@ int r100_pci_gart_init(struct radeon_device *rdev);
>   void r100_pci_gart_fini(struct radeon_device *rdev);
>   int r100_pci_gart_enable(struct radeon_device *rdev);
>   void r100_pci_gart_disable(struct radeon_device *rdev);
> -int r100_debugfs_mc_info_init(struct radeon_device *rdev);
> +void  r100_debugfs_mc_info_init(struct radeon_device *rdev);
>   int r100_gui_wait_for_idle(struct radeon_device *rdev);
>   int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring);
>   void r100_irq_disable(struct radeon_device *rdev);
> --
> 2.30.0
>

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] drm/radeon: fix compilation error
  2021-02-16 15:22 [PATCH 1/1] drm/radeon: fix compilation error Nirmoy Das
  2021-02-16 15:23 ` Christian König
@ 2021-02-16 15:24 ` Alex Deucher
  1 sibling, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2021-02-16 15:24 UTC (permalink / raw)
  To: Nirmoy Das
  Cc: Deucher, Alexander, Mark Broadworth, Christian Koenig, amd-gfx list

On Tue, Feb 16, 2021 at 10:22 AM Nirmoy Das <nirmoy.das@amd.com> wrote:
>
> Fixes below compilation error:
> conflicting types for ‘r100_debugfs_mc_info_init’
>
> Fixes: 6f8672d6523bfe38e ("drm/radeon: do not use drm middle layer for
> debugfs")
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reported-by: Mark Broadworth <Mark.Broadworth@amd.com>
> ---
> Hi Alex,
>
> Can you please squash this with the "Fixes" commit.
> I am not sure how I missed it.
> I even tested the patch with my radeon card before pushing.

Sure.

Acked-by: Alex Deucher <alexander.deucher@amd.com>

>
>  drivers/gpu/drm/radeon/r300.c        | 6 +-----
>  drivers/gpu/drm/radeon/radeon_asic.h | 2 +-
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 03b0d4a81f7a..92643dfdd8a8 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -1326,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device *rdev)
>  void r300_mc_program(struct radeon_device *rdev)
>  {
>         struct r100_mc_save save;
> -       int r;
>
> -       r = r100_debugfs_mc_info_init(rdev);
> -       if (r) {
> -               dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
> -       }
> +       r100_debugfs_mc_info_init(rdev);
>
>         /* Stops all mc clients */
>         r100_mc_stop(rdev, &save);
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 2c77f151ef62..1cf2a5e0d91d 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -108,7 +108,7 @@ int r100_pci_gart_init(struct radeon_device *rdev);
>  void r100_pci_gart_fini(struct radeon_device *rdev);
>  int r100_pci_gart_enable(struct radeon_device *rdev);
>  void r100_pci_gart_disable(struct radeon_device *rdev);
> -int r100_debugfs_mc_info_init(struct radeon_device *rdev);
> +void  r100_debugfs_mc_info_init(struct radeon_device *rdev);
>  int r100_gui_wait_for_idle(struct radeon_device *rdev);
>  int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring);
>  void r100_irq_disable(struct radeon_device *rdev);
> --
> 2.30.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] drm/radeon: fix compilation error
  2021-02-16 15:23 ` Christian König
@ 2021-02-16 17:41   ` Nirmoy
  0 siblings, 0 replies; 4+ messages in thread
From: Nirmoy @ 2021-02-16 17:41 UTC (permalink / raw)
  To: Christian König, Nirmoy Das, alexander.deucher
  Cc: Mark Broadworth, amd-gfx


On 2/16/21 4:23 PM, Christian König wrote:
>
>
> Am 16.02.21 um 16:22 schrieb Nirmoy Das:
>> Fixes below compilation error:
>> conflicting types for ‘r100_debugfs_mc_info_init’
>>
>> Fixes: 6f8672d6523bfe38e ("drm/radeon: do not use drm middle layer for
>> debugfs")
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>> Reported-by: Mark Broadworth <Mark.Broadworth@amd.com>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>
>> ---
>> Hi Alex,
>>
>> Can you please squash this with the "Fixes" commit.
>> I am not sure how I missed it.
>> I even tested the patch with my radeon card before pushing.
>
> Strange I'm pretty sure I've seen those lines in the original patch.


That hunk is actually missing from the original patch too but there

are multiple similar hunks.


I know what happened: I use "rsync -u .." to fast sync linux source with

the test machine. I think I accidentally fixed some compilation errors for

r100_debugfs_mc_info_init() in the test machine instead of the devel 
machine.

"rsync -u" wouldn't replace newer files in the dest machine leaving a 
correct/working

copy in the test machine but incorrect one in the devel machine from 
where I created the

patch.


Regards,

Nirmoy

>
> Christian.
>
>>
>>   drivers/gpu/drm/radeon/r300.c        | 6 +-----
>>   drivers/gpu/drm/radeon/radeon_asic.h | 2 +-
>>   2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/r300.c 
>> b/drivers/gpu/drm/radeon/r300.c
>> index 03b0d4a81f7a..92643dfdd8a8 100644
>> --- a/drivers/gpu/drm/radeon/r300.c
>> +++ b/drivers/gpu/drm/radeon/r300.c
>> @@ -1326,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device 
>> *rdev)
>>   void r300_mc_program(struct radeon_device *rdev)
>>   {
>>       struct r100_mc_save save;
>> -    int r;
>>
>> -    r = r100_debugfs_mc_info_init(rdev);
>> -    if (r) {
>> -        dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
>> -    }
>> +    r100_debugfs_mc_info_init(rdev);
>>
>>       /* Stops all mc clients */
>>       r100_mc_stop(rdev, &save);
>> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h 
>> b/drivers/gpu/drm/radeon/radeon_asic.h
>> index 2c77f151ef62..1cf2a5e0d91d 100644
>> --- a/drivers/gpu/drm/radeon/radeon_asic.h
>> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
>> @@ -108,7 +108,7 @@ int r100_pci_gart_init(struct radeon_device *rdev);
>>   void r100_pci_gart_fini(struct radeon_device *rdev);
>>   int r100_pci_gart_enable(struct radeon_device *rdev);
>>   void r100_pci_gart_disable(struct radeon_device *rdev);
>> -int r100_debugfs_mc_info_init(struct radeon_device *rdev);
>> +void  r100_debugfs_mc_info_init(struct radeon_device *rdev);
>>   int r100_gui_wait_for_idle(struct radeon_device *rdev);
>>   int r100_ib_test(struct radeon_device *rdev, struct radeon_ring 
>> *ring);
>>   void r100_irq_disable(struct radeon_device *rdev);
>> -- 
>> 2.30.0
>>
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-16 17:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-16 15:22 [PATCH 1/1] drm/radeon: fix compilation error Nirmoy Das
2021-02-16 15:23 ` Christian König
2021-02-16 17:41   ` Nirmoy
2021-02-16 15:24 ` Alex Deucher

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.