From patchwork Fri Jul 21 13:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 123886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp231713vqg; Fri, 21 Jul 2023 07:09:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2TN+iQKU8NpNhIxcZY4noPnDJeZUoaXNgsDYE42PSbS2t2D9c0NKSKHiGMBCEm9DyMai7 X-Received: by 2002:a17:902:8b85:b0:1b8:b288:6274 with SMTP id ay5-20020a1709028b8500b001b8b2886274mr1547238plb.18.1689948578508; Fri, 21 Jul 2023 07:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689948578; cv=none; d=google.com; s=arc-20160816; b=YvCLDYSpyDVhicT3T0elN5pqyOCWY/cyiK8SVOec2im/cLvLKXQb86ePo18LCqigr3 miaEuetyzfNMpYknx4foWrVvpyoviHl+vcn/dJc+54nTSpq+2ory8MJENJjFyVwfc+uK Vw87FnZS2P0Jk/cKmosMpW8pTFcXQvLibjq7XPtOa+q7kfORQanp1y8yryc0HkyARHtt EuyDXY6cZBurQJxiPOS/3eF9aT2oboC2s0vQFNjSXk1DtwcvfMgAnYxZJGv9ZiIqeoJb 7fOzTgPKXda1Ss25OY41qJNoYSh8VLizqNdBUwXxJ/E1DmZIgdWNfXvtMskchAP5jLUt bDYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4EOOReEeHXPly/BOLh4FNEqKRPM3bT5+Ff2Dmu2sDz4=; fh=P28QPhr53MSnOXnApqrGuOQKDhTc0ERHoJLYO3dOS0M=; b=SeGC3XjqcV46PC9w9sg3Y/THcJ5MtmP2cYcMW6vN83iMzjJZy83LCrrbia7faReKj+ Upzr3BHl8gAKGgMPAEP28PvylEsE0A9ftUQrDP0EJDfFES6YBfDkyeSTpR+wsa9lSIGJ UeuMRZMGFgXP1G31Pp0fJ9E2HHknqFz6cu7anlr0ItCQaKuueNhKqVDW5j/iV2uz243H ucB74Nof2pkg2qHTrcpvlb+Y6ddUbn5NQpxheTiSUF3NwFms/3e+iHaC+71o5x8nCacE 9xOfnnDbFVrzUjpyq5G2iDUb5HFAmb6bRJUMrQARkur6Fid68OpBYLaErQguZOTENPZ7 JLlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V7cmpBxS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a170902d58a00b001b809828a8fsi3214938plh.366.2023.07.21.07.09.17; Fri, 21 Jul 2023 07:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V7cmpBxS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231239AbjGUNnT (ORCPT + 99 others); Fri, 21 Jul 2023 09:43:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbjGUNnS (ORCPT ); Fri, 21 Jul 2023 09:43:18 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2425E1722; Fri, 21 Jul 2023 06:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689946997; x=1721482997; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=y9NwNsAvvJdmVT4QE057QDIVHB4LGSYtYpCb0IL6g84=; b=V7cmpBxSdrQTcPePu3paLZNO1EmDCure8gzkBEo6N8G2Z6CsBkzbWtf7 p9P2dyWMFGsOJDV+JyEDPkB+9qFTaiAm0JGNRfqba+6CVB+30ESR0i3SC zJWV9r3//VH5L1FdCuJHHhpynmeSDGXNZUBPG4ROlIO71j3V+XiiuJQbg Zm2/r/Mj+RIkfEkQi8/BMRbsmTkP9uo0Wl5P4SH8TVAfgPZcyTqAxt73D jYJVuIT4MHmovmITG3MAwpBIvC2ZcWDsycwkuKp15uC6wEx52L0S3nQu+ QsqC0LnxU3i4xKJ5bNk39vd+JgJAukYM0E3+4MOekvGF6BF/WP4vRJHAg A==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="430816233" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="430816233" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 06:43:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="848826421" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="848826421" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 21 Jul 2023 06:43:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0E01F370; Fri, 21 Jul 2023 16:43:18 +0300 (EEST) From: Andy Shevchenko To: Jani Nikula , Imre Deak , Andy Shevchenko , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Philipp Zabel , Helge Deller , Stephen Boyd , Nikita Shubin , Nikita Shubin via B4 Relay Subject: [PATCH v1 1/1] drm/i915: Move abs_diff() to math.h Date: Fri, 21 Jul 2023 16:42:35 +0300 Message-Id: <20230721134235.15517-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772039407990503707 X-GMAIL-MSGID: 1772039520957600463 abs_diff() belongs to math.h. Move it there. This will allow others to use it. Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 7 ------- drivers/gpu/ipu-v3/ipu-image-convert.c | 14 ++++++-------- drivers/video/fbdev/core/svgalib.c | 7 +------ include/linux/math.h | 6 ++++++ 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 6b2d8a1e2aa9..290e856fe9e9 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h index ba62eb5d7c51..04e6810954b2 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h @@ -29,13 +29,6 @@ #include "intel_wakeref.h" -/*FIXME: Move this to a more appropriate place. */ -#define abs_diff(a, b) ({ \ - typeof(a) __a = (a); \ - typeof(b) __b = (b); \ - (void) (&__a == &__b); \ - __a > __b ? (__a - __b) : (__b - __a); }) - enum tc_port; struct drm_i915_private; struct intel_atomic_state; diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index af1612044eef..420992ac2ecd 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c @@ -8,6 +8,8 @@ #include #include #include