From patchwork Thu Apr 16 09:18:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 210163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64842C352BE for ; Thu, 16 Apr 2020 09:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 407DD20771 for ; Thu, 16 Apr 2020 09:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392143AbgDPJST (ORCPT ); Thu, 16 Apr 2020 05:18:19 -0400 Received: from mga06.intel.com ([134.134.136.31]:54589 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392129AbgDPJSL (ORCPT ); Thu, 16 Apr 2020 05:18:11 -0400 IronPort-SDR: GF8vadV1jZhhA5LfBVwD/pZ4MkTyaJ0D7ypBdT3Lbn9/xJcNeZ3Qmr5oiQU03ckgNiVWeXVY59 G4tIqoztEl2Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 02:18:07 -0700 IronPort-SDR: te9M+XHgAUc2pYxFEveHr+Wa17olzmifFUG3TUB1h+Ji6w1I5OFVwyx2qpyq7+m3CVC7+1ifAg h1eTfNm1/mBQ== X-IronPort-AV: E=Sophos;i="5.72,390,1580803200"; d="scan'208";a="288832127" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 02:18:05 -0700 Received: from punajuuri.localdomain (punajuuri.localdomain [192.168.240.130]) by paasikivi.fi.intel.com (Postfix) with ESMTP id AB49420746; Thu, 16 Apr 2020 12:18:03 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.92) (envelope-from ) id 1jP0fa-00087e-Ax; Thu, 16 Apr 2020 12:18:50 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: rajmohan.mani@intel.com, bingbu.cao@intel.com, tfiga@chromium.org Subject: [PATCH 1/3] Revert "staging: imgu: Address a compiler warning on alignment" Date: Thu, 16 Apr 2020 12:18:48 +0300 Message-Id: <20200416091850.31177-2-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200416091850.31177-1-sakari.ailus@linux.intel.com> References: <20200416091850.31177-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This reverts commit ef4104f3d81d8f0d897d7f0cd5d01b006c3caf80. The patch being reverted changed the memory layout of struct ipu3_uapi_acc_param. Revert it, and address the compiler warning issues in further patches. Reported-by: Tomasz Figa Signed-off-by: Sakari Ailus --- drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h index 1c9c3ba4d518d..5f43f631cf62f 100644 --- a/drivers/staging/media/ipu3/include/intel-ipu3.h +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h @@ -2477,7 +2477,7 @@ struct ipu3_uapi_acc_param { struct ipu3_uapi_yuvp1_yds_config yds2 __attribute__((aligned(32))); struct ipu3_uapi_yuvp2_tcc_static_config tcc __attribute__((aligned(32))); struct ipu3_uapi_anr_config anr; - struct ipu3_uapi_awb_fr_config_s awb_fr __attribute__((aligned(32))); + struct ipu3_uapi_awb_fr_config_s awb_fr; struct ipu3_uapi_ae_config ae; struct ipu3_uapi_af_config_s af; struct ipu3_uapi_awb_config awb; From patchwork Thu Apr 16 09:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 210164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1057C352BE for ; Thu, 16 Apr 2020 09:18:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99C95214D8 for ; Thu, 16 Apr 2020 09:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392141AbgDPJSO (ORCPT ); Thu, 16 Apr 2020 05:18:14 -0400 Received: from mga09.intel.com ([134.134.136.24]:26415 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392122AbgDPJSK (ORCPT ); Thu, 16 Apr 2020 05:18:10 -0400 IronPort-SDR: 1i6c4fO764gQNogmULoIQ+KKElIab1bn0WD7osyNzPGSEv6wT3yvMQbDtH6XofTKQSn+VxWBTQ VNBDiVzEod4Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 02:18:07 -0700 IronPort-SDR: fx6QjBdzNuCkKVqGs9sC9txwuBHxIUDaVox0y6Wi+KZRJ6A9XZ27nr1fD23hULFSawLHbdBkrR Y8U9IkWJpYZA== X-IronPort-AV: E=Sophos;i="5.72,390,1580803200"; d="scan'208";a="242591048" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 02:18:05 -0700 Received: from punajuuri.localdomain (punajuuri.localdomain [192.168.240.130]) by paasikivi.fi.intel.com (Postfix) with ESMTP id ABB3A20939; Thu, 16 Apr 2020 12:18:03 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.92) (envelope-from ) id 1jP0fa-00087h-C6; Thu, 16 Apr 2020 12:18:50 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: rajmohan.mani@intel.com, bingbu.cao@intel.com, tfiga@chromium.org Subject: [PATCH 2/3] staging: ipu3-imgu: Move alignment attribute to field Date: Thu, 16 Apr 2020 12:18:49 +0300 Message-Id: <20200416091850.31177-3-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200416091850.31177-1-sakari.ailus@linux.intel.com> References: <20200416091850.31177-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Move the alignment attribute of struct ipu3_uapi_awb_fr_config_s to the field in struct ipu3_uapi_4a_config, the other location where the struct is used. Signed-off-by: Sakari Ailus --- drivers/staging/media/ipu3/include/intel-ipu3.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h index 5f43f631cf62f..a607b0158c81d 100644 --- a/drivers/staging/media/ipu3/include/intel-ipu3.h +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h @@ -450,7 +450,7 @@ struct ipu3_uapi_awb_fr_config_s { __u32 bayer_sign; __u8 bayer_nf; __u8 reserved2[7]; -} __attribute__((aligned(32))) __packed; +} __packed; /** * struct ipu3_uapi_4a_config - 4A config @@ -466,7 +466,8 @@ struct ipu3_uapi_4a_config { struct ipu3_uapi_ae_grid_config ae_grd_config; __u8 padding[20]; struct ipu3_uapi_af_config_s af_config; - struct ipu3_uapi_awb_fr_config_s awb_fr_config; + struct ipu3_uapi_awb_fr_config_s awb_fr_config + __attribute__((aligned(32))); } __packed; /**