From patchwork Tue Jan 8 09:08:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lauri Kasanen X-Patchwork-Id: 11678 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6E04644CD73 for ; Tue, 8 Jan 2019 11:05:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 218FA68A092; Tue, 8 Jan 2019 11:05:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7FA268830E for ; Tue, 8 Jan 2019 11:05:24 +0200 (EET) Received: from Valinor ([84.250.81.169]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0Llm9w-1hG84t0rya-00ZOW4 for ; Tue, 08 Jan 2019 10:05:35 +0100 Date: Tue, 8 Jan 2019 11:08:04 +0200 From: Lauri Kasanen To: ffmpeg-devel@ffmpeg.org Message-Id: <20190108110804.01e3ad9ef85ea7446ad4c61a@gmx.com> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.18.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Provags-ID: V03:K1:O4uB57gaKyvWUuEY332HbvExjWj7/7QgMbYdId1OlOUs8TmDren O5FNDOdSelDCFmbZy6srpGfvyErL5E/1DZBNuVnMdRqpjPUhCDblhmvfK+8cX9pgXGEYkZW fY6rXTD/a1Ow5YOehL0Yq5YiK5ENnAOsRgFUHarxabwQ9o04At+xSrCvZgexQKDxFUYEMSV dW87itbY4qq4+NaxejiLQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:MfBmjN2Dt38=:FTUvsB5ahF06S8Yv4N/oGh m2gea8HHON3ofKsViHoqk9UW3bEBAhmmD+xB/sEML7V8VgsbncfWn54YnUV/PzWDo11tV4l3k Yd1iDuSZWswlY9qE8xeILRSshw6mF3SYud8wCBrqNYZeHR2DQFxSr8KMkLGbw8mAdrupeIrlQ X5clW6txcNgojJHJfBMzfoauzjCZaLtIlo340JRak+HVDdGbq8lA0Sa73TTtG80GQ6yC7ejm0 er3BLYJYAzKkxCBGSxPB4pB2mrcRoVwC9YhYjc8yrVnj4QT4n3AMoce9zZnFBr6Uz6ZBfrDyX XuXq17dzpRgt/aCbIgUKgo1eIQ5BaCzNC63KfwJUX03bOhpsAq1+tNbBgW0JuYPxzNvJedgPJ 45XaaZ6pp8X0kH+xFWiCYLEiNsBwMXEj54GKotm2F/PpKO3K8Qmt2XFRF4LnK81jzgU6YmBJy VjT+ibTl8qDjkJllTriKB4dawEBXcRr6vhJF1q6N5UInHaRexaSPHj3ErUGanwS3du0sAiQJP eGYyBKggTbkN1048gqVodusRJYeRFgf63mi5KxukN6aVrbBFIVf9Kdun8kCzrZd51udYJFfJG dTKKMmm5ssjZgXb6lPx3n1OXOQae3TSynv60bfMcLDqAEjGK9PyhMeQDTy0EU43QPklPd667c Fu9xlsdK4vBZA2N79bsoJ4O/fID1bFH94Ed4/0elIh0oP9D+ucc5/D4YOO3Ft97FUituZvxms qUWeP4qLiZhbx0y5JYsKE3bWWR/1y0q/Bs2eb7u/BltMIgV6mNeLMdXsb7kvRBtv8/5B5/c+t QI8d5fiRE4wcr6GXlYhQMFOfQmlvneq541E+nuM7MvC4HaaDoH4/XNpzqZERv1JLV/bKuoMsN wzTyQSlHGT0YAl93lCF3L8DlT3Lookw8v/kPPoE004OxMmx/KDXMkmyHt+RTOp Subject: [FFmpeg-devel] [PATCH] avutil/ppc/cpu: Fix power8 linux detection X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The existing code was in no released kernel that I can see. The corrected code was added in 3.9. Signed-off-by: Lauri Kasanen --- libavutil/ppc/cpu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c index 7bb7cd8..b022149 100644 --- a/libavutil/ppc/cpu.c +++ b/libavutil/ppc/cpu.c @@ -93,13 +93,13 @@ int ff_get_cpu_flags_ppc(void) if (buf[i + 1] & PPC_FEATURE_HAS_VSX) ret |= AV_CPU_FLAG_VSX; #endif -#ifdef PPC_FEATURE_ARCH_2_07 - if (buf[i + 1] & PPC_FEATURE_HAS_POWER8) - ret |= AV_CPU_FLAG_POWER8; -#endif if (ret & AV_CPU_FLAG_VSX) av_assert0(ret & AV_CPU_FLAG_ALTIVEC); - goto out; + } else if (buf[i] == AT_HWCAP2) { +#ifdef PPC_FEATURE2_ARCH_2_07 + if (buf[i + 1] & PPC_FEATURE2_ARCH_2_07) + ret |= AV_CPU_FLAG_POWER8; +#endif } } }