From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C87DCC48BC3 for ; Mon, 19 Feb 2024 10:48:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 873DD10E2CD; Mon, 19 Feb 2024 10:48:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VBkUhStD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BF0A10E2CD; Mon, 19 Feb 2024 10:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708339725; x=1739875725; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=/Yzb1+tUfy9DbCAkneIo9zIHOD9oV2ghUzPslP0ap5Y=; b=VBkUhStDVpq/17PVPdjtAOKyMxpHSaM2cXpsPME+tBr77r9/+WnTmxJF sWLNRFbwZVQm0kd/jmAqCpO30Sl7to0/9B+7IRcboXnPE4Irza2dfAw02 8/BekzCJn3Dc2rVUIfadJ5TvBOpQm14+i6oZ7G9vHzsRX2D9BvmilXvDf YEb2R/6NALS8krfzpXaTMzvuUfdg3Rw166aoruijqcPspfxnRHPVkDc4p 6Hx4kQbaclHUhLkBosI0+nJCZPYUorI0xSRG//BPiu70coeXEBUEPRkmI Ie54K0tXWxL9JESH+dN+XXjYsCXt0AWICUu3D2ae0p1A0sIpRguOYEwI7 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10988"; a="2558113" X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="2558113" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 02:48:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="27629781" Received: from proe-mobl.ger.corp.intel.com (HELO [10.252.22.52]) ([10.252.22.52]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 02:48:43 -0800 Message-ID: Date: Mon, 19 Feb 2024 10:48:41 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/6] drm/tests/drm_buddy: fix 32b build Content-Language: en-GB To: =?UTF-8?Q?Christian_K=C3=B6nig?= , intel-xe@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Geert Uytterhoeven , Arunpravin Paneer Selvam , Maxime Ripard References: <20240215174431.285069-7-matthew.auld@intel.com> <96bb6e97-34d9-4e4a-b618-85c17e809738@intel.com> <5a9e1f30-19fc-486f-b7f5-016d82580d2f@amd.com> <4aea62d4-8c2a-4406-b81e-240dca772da4@intel.com> <45059d66-6e80-406b-aae2-72f8b8d142cb@amd.com> From: Matthew Auld In-Reply-To: <45059d66-6e80-406b-aae2-72f8b8d142cb@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 19/02/2024 10:30, Christian König wrote: > Am 19.02.24 um 11:28 schrieb Matthew Auld: >> On 19/02/2024 09:53, Christian König wrote: >>> Am 19.02.24 um 10:42 schrieb Matthew Auld: >>>> On 15/02/2024 17:44, Matthew Auld wrote: >>>>> Doesn't seem to compile on 32b, presumably due to u64 mod/division. >>>>> Simplest is to just switch over to u32 here. Also make print modifiers >>>>> consistent with that. >>>>> >>>>> Fixes: a64056bb5a32 ("drm/tests/drm_buddy: add alloc_contiguous test") >>>>> Reported-by: Geert Uytterhoeven >>>>> Signed-off-by: Matthew Auld >>>>> Cc: Arunpravin Paneer Selvam >>>>> Cc: Christian König >>>>> Cc: Maxime Ripard >>>> >>>> Any chance someone can push just this single patch here, since it >>>> fixes 32b build? It already has an r-b from Arun. >>> >>> Already working on this. Just give me a few more minutes. >> >> Thanks. > > No, problem. I would have pushed this earlier, but my build server > doesn't want to work any more. Looks like the SSD has passed its > warranty :( > > Should I push the other three patches to drm-misc-fixes as well? I > currently can't even build test them. Need to send a v2 for that. One minor change in the test just to be consistent with using u32. Thanks. > > Thanks, > Christian. > >> >>> >>> Thanks, >>> Christian. >>> >>>> >>>>> --- >>>>>   drivers/gpu/drm/tests/drm_buddy_test.c | 16 ++++++++-------- >>>>>   1 file changed, 8 insertions(+), 8 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c >>>>> b/drivers/gpu/drm/tests/drm_buddy_test.c >>>>> index fee6bec757d1..edacc1adb28f 100644 >>>>> --- a/drivers/gpu/drm/tests/drm_buddy_test.c >>>>> +++ b/drivers/gpu/drm/tests/drm_buddy_test.c >>>>> @@ -21,7 +21,7 @@ static inline u64 get_size(int order, u64 >>>>> chunk_size) >>>>>     static void drm_test_buddy_alloc_contiguous(struct kunit *test) >>>>>   { >>>>> -    u64 mm_size, ps = SZ_4K, i, n_pages, total; >>>>> +    u32 mm_size, ps = SZ_4K, i, n_pages, total; >>>>>       struct drm_buddy_block *block; >>>>>       struct drm_buddy mm; >>>>>       LIST_HEAD(left); >>>>> @@ -56,30 +56,30 @@ static void >>>>> drm_test_buddy_alloc_contiguous(struct kunit *test) >>>>>           KUNIT_ASSERT_FALSE_MSG(test, >>>>>                          drm_buddy_alloc_blocks(&mm, 0, mm_size, >>>>>                                     ps, ps, list, 0), >>>>> -                       "buddy_alloc hit an error size=%d\n", >>>>> +                       "buddy_alloc hit an error size=%u\n", >>>>>                          ps); >>>>>       } while (++i < n_pages); >>>>>         KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                  3 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc didn't error size=%d\n", 3 * ps); >>>>> +                   "buddy_alloc didn't error size=%u\n", 3 * ps); >>>>>         drm_buddy_free_list(&mm, &middle); >>>>>       KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                  3 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc didn't error size=%llu\n", 3 * ps); >>>>> +                   "buddy_alloc didn't error size=%u\n", 3 * ps); >>>>>       KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                  2 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc didn't error size=%llu\n", 2 * ps); >>>>> +                   "buddy_alloc didn't error size=%u\n", 2 * ps); >>>>>         drm_buddy_free_list(&mm, &right); >>>>>       KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                  3 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc didn't error size=%llu\n", 3 * ps); >>>>> +                   "buddy_alloc didn't error size=%u\n", 3 * ps); >>>>>       /* >>>>>        * At this point we should have enough contiguous space for 2 >>>>> blocks, >>>>>        * however they are never buddies (since we freed middle and >>>>> right) so >>>>> @@ -88,13 +88,13 @@ static void >>>>> drm_test_buddy_alloc_contiguous(struct kunit *test) >>>>>       KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                   2 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc hit an error size=%d\n", 2 * ps); >>>>> +                   "buddy_alloc hit an error size=%u\n", 2 * ps); >>>>>         drm_buddy_free_list(&mm, &left); >>>>>       KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, >>>>> mm_size, >>>>>                                   3 * ps, ps, &allocated, >>>>> DRM_BUDDY_CONTIGUOUS_ALLOCATION), >>>>> -                   "buddy_alloc hit an error size=%d\n", 3 * ps); >>>>> +                   "buddy_alloc hit an error size=%u\n", 3 * ps); >>>>>         total = 0; >>>>>       list_for_each_entry(block, &allocated, link) >>> >