Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Message-ID: <b236ff60-085b-460a-b1eb-ddcea1c79094@amd.com>
Date:   Wed, 13 Dec 2023 07:38:19 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2] drm/radeon: Prevent multiple debug error lines on
 suspend
Content-Language: en-US
To:     Woody Suwalski <terraluna977@gmail.com>,
        LKML <linux-kernel@vger.kernel.org>,
        amd-gfx@lists.freedesktop.org
Cc:     "Deucher, Alexander" <alexander.deucher@amd.com>
References: <90172f4c-7cf7-b4ac-d630-42198bb80d62@gmail.com>
From:   =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
In-Reply-To: <90172f4c-7cf7-b4ac-d630-42198bb80d62@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y0RJUjRkdVVyMTJVbmpQM1c4RFZ0TlZ5dEJwNEtWZGFiUDNnb3dMbEpqUFRn?=
 =?utf-8?B?SGRsM0tLN2UvNkcrR2ltdENuR1BGbzhvSUM0NHp3S3hGRDVDTWxPaWVEZzFu?=
 =?utf-8?B?M0JscXo4eEJGZU5waGFJVG52eVNYeE45NEZwYWdBMnY0cGF5aTIyck45TlpP?=
 =?utf-8?B?SytFWEJQMlhPN0l3N3daejJQM0w4MzQ2NEdwWkhzc3dQZHlaYy9vRGt4M0VX?=
 =?utf-8?B?eHQwa1lQTHpRNjgxbStwdzduRDVyangwM29mN3crMFZ4NWdLZ3BGbXhHZ1Nk?=
 =?utf-8?B?UUIwRGdvcVhNcjlvOTljWnU2MloycHBuamFLR0dKZWtIYzA1SU0xdldtVUFT?=
 =?utf-8?B?alpQQ2wvUkF2RWdlckRZRlBkV3VrV3g1eTEvWVloMjJuQlFYYjR1ZnY5Skxz?=
 =?utf-8?B?OHd0dkZqSHpsK0dlbGRPSlRmUUdNcU4wZTlNL21IMWIxWG1JYXNvQWdpeTVl?=
 =?utf-8?B?K1Vsc1hDZGpDOWp1S3NBOVJmbVQvY3d1SDlhUlhvbFB5bnYxdVlTZVZzSE5v?=
 =?utf-8?B?RTFNOEdqNGpZZEt6MUpqSldoZmV1MDlhcnBHSG5QS2pjSjNSNXE2WFJ2R3hT?=
 =?utf-8?B?UUhBdTZLVDNLYm5oTmxXd1g0L2h4dlM2bHlZVDZNS2Uxa2daL0FiOERITzRu?=
 =?utf-8?B?a2FzVEVUdG1ZUzQ5d2NzcDFBVm9aTFAvUGdwSjFFZXE3UW0vQTk5TWNPbmNX?=
 =?utf-8?B?TGpCM3E0UGZCQm9oS1NZa29lQzVEZCs0NEwxaWVuWDVrWm83YWx1NVRxaHJY?=
 =?utf-8?B?am1iU20vMS8xTmR4MW5tUnMxZ0dGNXJudWpmZkREQzVSR3YzNTVWR28waWpG?=
 =?utf-8?B?NnlGUW1CaGUxVDVkdWdybE5ORnV5cHJLSm1id0VnRzRrSHhGR3liQmhOWDN5?=
 =?utf-8?B?T2JJMTl1Zm10SkIybnVJTFBBY0JRWkdFM21VUkptR0JrdXQ5ZHdibFBGN2Ft?=
 =?utf-8?B?QWVWeFhjdExQUFplZ1NGem9RSXBDdkN4OWxpZ3R1VEtrM0ZaOTloc3dHZVVJ?=
 =?utf-8?B?RGZvL0lPT25CdFNvdlJ1ellVaWdUdWxNR3VnQi9OenRQMVRWN0dwa2t6N3Bi?=
 =?utf-8?B?R0psU3c5UzI5UTBoSldCWThtMGxnWGRmdm1HVGJXYU0wU21tTmUrOHRtVEhK?=
 =?utf-8?B?NnFVYjZHNjlYSFRWbTFkNjFPUHRTbmd6czBneUxPRStaWWZqRy9DdFpRd0ZQ?=
 =?utf-8?B?QWlLZEh1TjVKUGF0bFFpN282V1BxbmFpdjVjYXhGbllSbHBySjhyUjhyZkMw?=
 =?utf-8?B?Y3luN0ZpTUVDdXpMTkdrNEpmdHZ6c1ZFaWh3NTQ4Y0tCZHhrVXpQeGtOcHNs?=
 =?utf-8?B?bXVjUGZFajR1bHJ5NmY5OGs3SnhwOEhYL3FiTnU4SktLSjdRWWZacFliVGFM?=
 =?utf-8?B?bklMUjVvaXBhMEFIN0dueWNlS09SUFhONExRWGVpandqTVE3MmR6VG8vOS9I?=
 =?utf-8?B?blE4SDlPU1NZa0FtczZOQzZnbkRhKzlEaXJQMTJvYWtNWFZXbVdVdzAzelVQ?=
 =?utf-8?B?L3pURVJicVVrMzNaM0dRUkpxMDB0WUp5SHI3SVpMNnA4WUs5OEZCYmNQVkk2?=
 =?utf-8?B?bnBtekh2MFk5Slg2NjYvZndpU0RZTTNsUHNKYmhwdzFzRjdNcHJIVWpMekpz?=
 =?utf-8?B?a20rM2w1NEJIeFg3MjlTYy8vbG93ejhzUGZJbWlTellKc21vTWxjdWEvZ2N1?=
 =?utf-8?B?YVFRUlFOUStUQXlHNmJSOVNEbXYzRHM5ZkF6SzkrdUNySzdqa3VwN2tha1BV?=
 =?utf-8?B?K0NTMDl0TGZpaHlsVFFqMUExd1JXa1R5ckhYYW1kTEZ3bGpiMTNjSHlkVHAw?=
 =?utf-8?B?dXZnc0d3ZHNiNThINDkrMU5pTVFYSVg5TXZXdWF5NjEwdmVLRlZWWGROaFVk?=
 =?utf-8?B?OW0zR0JmYzlhMFNXa2hnZi9hekcwV2FzMG1pd2NvcjIrTkVLQ1lnQkNFdFBn?=
 =?utf-8?B?WkN3OU8ra3VaYS96cVNaS3lFYmRqTi9IYVA3VldZNHhRUWJCbThlR09zUkZK?=
 =?utf-8?B?YVpxTnNpNVlTd3lGSkNmT214dnA2b3JkZnhBczE4emFDK2NJMC9WRnd5RVZ5?=
 =?utf-8?B?WWtGVHV1UFoxWTk4T1I4azQxSUI5R3hCS0dxS29ZOTZJY1BMUkJoN1VtWHJn?=
 =?utf-8?Q?hyDM=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 95fe94b7-2722-467d-81b8-08dbfba61c9b
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3589.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 06:38:28.3936
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rtWrD/hmMLveFQZogx7uOJmwypZxN3qxrGMby/VHpS/GAMZS7fd/Yv7Iv2ZFlZhX
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7634
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 12 Dec 2023 22:38:40 -0800 (PST)

Am 13.12.23 um 00:31 schrieb Woody Suwalski:
> Fix to avoid multiple debug error lines printed on every suspend by 
> Radeon driver's debugfs.
>
> radeon_debugfs_init() calls debugfs_create_file() for every ring.
>
> This results in printing multiple error lines to the screen and dmesg 
> similar to this:
>
> [   92.378726] debugfs: File 'radeon_ring_gfx' in directory 
> '0000:00:01.0' already present!
> [   92.378732] debugfs: File 'radeon_ring_cp1' in directory 
> '0000:00:01.0' already present!
> [   92.378734] debugfs: File 'radeon_ring_cp2' in directory 
> '0000:00:01.0' already present!
> [   92.378737] debugfs: File 'radeon_ring_dma1' in directory 
> '0000:00:01.0' already present!
> [   92.378739] debugfs: File 'radeon_ring_dma2' in directory 
> '0000:00:01.0' already present!
> [   92.380775] debugfs: File 'radeon_ring_uvd' in directory 
> '0000:00:01.0' already present!
> [   92.406620] debugfs: File 'radeon_ring_vce1' in directory 
> '0000:00:01.0' already present!
> [   92.406624] debugfs: File 'radeon_ring_vce2' in directory 
> '0000:00:01.0' already present!
>
>
> Patch v1: The fix was to run lookup() for the file before trying to 
> (re)create that debug file.
> Patch v2: Call the radeon_debugfs_init() only once when radeon ring is 
> initialized (as suggested  by Christian K. - thanks)
>
> Signed-off-by: Woody Suwalski <terraluna977@gmail.com>

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

Thanks for the help,
Christian.

>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c 
> b/drivers/gpu/drm/radeon/radeon_ring.c
> index e6534fa9f1fb..38048593bb4a 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -413,6 +413,7 @@ int radeon_ring_init(struct radeon_device *rdev, 
> struct radeon_ring *ring, unsig
>              dev_err(rdev->dev, "(%d) ring map failed\n", r);
>              return r;
>          }
> +        radeon_debugfs_ring_init(rdev, ring);
>      }
>      ring->ptr_mask = (ring->ring_size / 4) - 1;
>      ring->ring_free_dw = ring->ring_size / 4;
> @@ -421,7 +422,6 @@ int radeon_ring_init(struct radeon_device *rdev, 
> struct radeon_ring *ring, unsig
>          ring->next_rptr_gpu_addr = rdev->wb.gpu_addr + index;
>          ring->next_rptr_cpu_addr = &rdev->wb.wb[index/4];
>      }
> -    radeon_debugfs_ring_init(rdev, ring);
>      radeon_ring_lockup_update(rdev, ring);
>      return 0;
>  }
>