From patchwork Sun Oct 7 11:13:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1560971 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 58A76DFF71 for ; Sun, 7 Oct 2012 11:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752661Ab2JGLNm (ORCPT ); Sun, 7 Oct 2012 07:13:42 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:53558 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062Ab2JGLNl (ORCPT ); Sun, 7 Oct 2012 07:13:41 -0400 Received: by mail-bk0-f46.google.com with SMTP id jk13so1586382bkc.19 for ; Sun, 07 Oct 2012 04:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=D1H4jIFADJyf3wVR0hCIjEKEwtVw9iMQt5rTLcGGgM4=; b=VzE8/u1F63FDA0h2XB2OQhOv/mmSyLwMtx8jEAGlXCFNOS04SPU+tokFjuVachkVKv RvnsUM5PVYd1zOzc78TE1iBNVTadiQEOifdAD/IOrrYiQZr2U0sjJrt+c97PpSnfFLfO 9d/PuI1jt3kOH9090xQ0QKQ/7YzvqPu+kGn44IlCDM2ygG2W03ARnYuI3G2w5+huRm7i KCRqiO8IL1UvYzHtD2AT+OM1c4nOLmVJfJzzbLKbVjQnu9z54DO3qE6CjoKrsZ+Z77oI Ixh0AUvmXFPctCxpRtB32g1iFrL3eyBDOdIzEjQVsVw3qV+4AYnHdIkmVBiYbpFYweSm urLA== Received: by 10.205.123.147 with SMTP id gk19mr4206003bkc.90.1349608419776; Sun, 07 Oct 2012 04:13:39 -0700 (PDT) Received: from [192.168.1.110] (031011252076.warszawa.vectranet.pl. [31.11.252.76]) by mx.google.com with ESMTPS id x13sm10260934bkv.16.2012.10.07.04.13.37 (version=SSLv3 cipher=OTHER); Sun, 07 Oct 2012 04:13:39 -0700 (PDT) Message-ID: <507163E0.7040602@gmail.com> Date: Sun, 07 Oct 2012 13:13:36 +0200 From: Sylwester Nawrocki User-Agent: Mozilla/5.0 (X11; Linux i686; rv:11.0) Gecko/20120412 Thunderbird/11.0.1 MIME-Version: 1.0 To: Michael West CC: Sylwester Nawrocki , Jan Hoogenraad , Sylwester Nawrocki , "linux-media@vger.kernel.org" , "a.hajda@samsung.com" , "sakari.ailus@iki.fi" , "laurent.pinchart@ideasonboard.com" , "hverkuil@xs4all.nl" , Kyungmin Park , "sw0312.kim@samsung.com" Subject: Re: Media_build broken by [PATCH RFC v3 5/5] m5mols: Implement .get_frame_desc subdev callback References: <1348674853-24596-1-git-send-email-s.nawrocki@samsung.com> <1348674853-24596-6-git-send-email-s.nawrocki@samsung.com> <50704D26.9020201@hoogenraad.net> <50707704.5030402@gmail.com> <50707BE0.9010209@hoogenraad.net> <5070A3C9.8040409@gmail.com> In-Reply-To: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 10/07/2012 03:19 AM, Michael West wrote: > This patch changes versions.txt and disables VIDEO_M5MOLS which > fixed the build for my 3.2 kernel but looking at the logs it looks > like this is not the way to fix it as it's not just a 3.6+ problem > as it does not build on 3.6 as well... So probably best to find > why it doesn't build on the current kernel first. To fix the build on kernels 3.6+ just needs to be inclcuded in m5mols.h. This is what my patch from previous message in this thread does. But this will break again on kernel versions _3.5 and lower_ where doesn't exist. I thought originally it could have been simply replaced there with , but not all architectures have it $ git grep "#define SZ_1M" v2.6.32 v2.6.32:arch/arm/include/asm/sizes.h:#define SZ_1M 0x00100000 v2.6.32:arch/sh/include/asm/sizes.h:#define SZ_1M 0x00100000 $ git grep "#define SZ_1M" v3.6-rc5 v3.6-rc5:drivers/base/dma-contiguous.c:#define SZ_1M (1 << 20) v3.6-rc5:include/linux/sizes.h:#define SZ_1M 0x00100000 Let's just use the below patch to solve this build break, this way there is no need to touch anything at media_build. From 11adc6956f3fe87c897aa6add08f8437422969a8 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Sun, 7 Oct 2012 13:04:37 +0200 Subject: [PATCH] m5mols: Replace SZ_1M with explicit value SZ_1M macro definition was introduced in commit ab7ef22419927 "[media] m5mols: Implement .get_frame_desc subdev callback" but required header was not included. To prevent build errors with older kernels where doesn't exist use explicit value rather than SZ_1M. Reported-by: Jan Hoogenraad Signed-off-by: Sylwester Nawrocki Acked-by: Hans Verkuil --- drivers/media/i2c/m5mols/m5mols.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/i2c/m5mols/m5mols.h b/drivers/media/i2c/m5mols/m5mols.h index 4ab8b37..30654f5 100644 --- a/drivers/media/i2c/m5mols/m5mols.h +++ b/drivers/media/i2c/m5mols/m5mols.h @@ -24,7 +24,7 @@ * determined by CAPP_JPEG_SIZE_MAX register. */ #define M5MOLS_JPEG_TAGS_SIZE 0x20000 -#define M5MOLS_MAIN_JPEG_SIZE_MAX (5 * SZ_1M) +#define M5MOLS_MAIN_JPEG_SIZE_MAX (5 * 1024 * 1024) extern int m5mols_debug;