From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CF9F3EC685 for ; Tue, 25 Aug 2026 09:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787650559; cv=none; b=l+1CgALUbnMycaCr26xf67NinAuBj3k50C2qNq3jmRBG0hGs4KUFyo6ttgJ+7pgEiTU1PMoOjM+dsdgdNFoe3/LJXFlmBGFZZ8J3bqCRVHiPzK1TQG75sXZjmTksexKQSceB67jm5lbPMhnnQYeoXe3m/nqdj2k7fEweOpT03Ns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787650559; c=relaxed/simple; bh=dVmusFmNosE0q4+P8QypnqQyz1/BdpEQ1D1Kf5PrQak=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=J24AIVWA5ivnr+3aZcHn4kUQOJkgXoOq9pPPYfsyxy3zOdmz8puZh5HPg4XpQq4LKw0Nrhp3mdnq++yQtakTpmjYxo+aosYFCA89PVwIQsRG2ftlOYs+lYZ5of0PzyQB3HLToNA8+uBxLUtT1kYSIUn/C8UPQNL7bwMUoMixB8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MLQkh3go; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MLQkh3go" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1787650558; x=1819186558; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dVmusFmNosE0q4+P8QypnqQyz1/BdpEQ1D1Kf5PrQak=; b=MLQkh3goyZ0zxq9952HpDnrtNxIDg8/JX/QXqj4PVrHyOeX1tWg9lt8t GewADeBaaywXDEHQf4/TAaIzO51xvrXPCXjhOOvxi+Wh/xL/VxOIVTs9o vvqqETw4jibhh0zKwR5hweVuTvtxoOkxbkSg05Bzn67uQ/CRYKqaWGq5j m/ctpzvx1T02o73ERF4MuL+WJNiTdMcbJ9Q5LQ9rnaCx1K81Mk2MN2Y8s d+/cuKMyllF4nSoac4++W3U7ILComWxgc26YPD2vHpT0X62qN9fyXARNZ ZIi37OVpa8nS1zs4WpvEcT4JIojQVwLog8LggIFuWiay5Yxli3sBcKgHr Q==; X-CSE-ConnectionGUID: Ne8OaZ98TR69SSVCKK2EKw== X-CSE-MsgGUID: FY5WAjpdQcmsVmy5rO9fpw== X-IronPort-AV: E=McAfee;i="6800,10657,11885"; a="75647833" X-IronPort-AV: E=Sophos;i="6.25,242,1779174000"; d="scan'208";a="75647833" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2026 02:35:57 -0700 X-CSE-ConnectionGUID: wcU2V+7OThKXYHLHvD63uw== X-CSE-MsgGUID: xHRxiteTSiyRZyYzW6+WBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,242,1779174000"; d="scan'208";a="290767930" Received: from black.igk.intel.com ([10.91.253.5]) by fmviesa002.fm.intel.com with ESMTP; 25 Aug 2026 02:35:54 -0700 Received: by black.igk.intel.com (Postfix, from userid 1003) id 5650899; Tue, 25 Aug 2026 11:35:53 +0200 (CEST) From: Andy Shevchenko To: Andi Shyti , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Andy Shevchenko Subject: [PATCH v1 1/1] drm/i915/gem: Use simpler versions of min*() Date: Tue, 25 Aug 2026 11:35:52 +0200 Message-ID: <20260825093552.4088094-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of harder to read min_array() and prone to mistakes min_t() use min3() and min(). No functional changes intended. The types of the values are unsigned, no side-effects are expected. Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index ef9440166295..bf9e7480f0f5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -153,11 +153,8 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, } } while (1); - nr_pages = min_array(((unsigned long[]) { - folio_nr_pages(folio), - page_count - i, - max_segment / PAGE_SIZE, - }), 3); + nr_pages = min3(folio_nr_pages(folio), + page_count - i, max_segment / PAGE_SIZE); if (!i || sg->length >= max_segment || @@ -168,8 +165,7 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, st->nents++; sg_set_folio(sg, folio, nr_pages * PAGE_SIZE, 0); } else { - nr_pages = min_t(unsigned long, nr_pages, - (max_segment - sg->length) / PAGE_SIZE); + nr_pages = min(nr_pages, (max_segment - sg->length) / PAGE_SIZE); sg->length += nr_pages * PAGE_SIZE; } -- 2.50.1