Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 176E5E80A97 for ; Wed, 27 Sep 2023 06:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbjI0G5z (ORCPT ); Wed, 27 Sep 2023 02:57:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229926AbjI0G5x (ORCPT ); Wed, 27 Sep 2023 02:57:53 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D420F5 for ; Tue, 26 Sep 2023 23:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695797873; x=1727333873; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uxB+lWAh4A15MsNzg3kE/r/kG1alOR1cjFsr2RvjYL0=; b=NCnQPZ8YSZF5um0fQH4FYyhxT8TbPuJIL82pcPQTeWXvxTvc3KSHTX65 TupOUET0uqE6lBJKWx7n0H0Lh59cYO/pLb6jMzjccyGoWJR7m77b3zmGy S4LERrzCBFRwJHGy2kFOd0swVkLLoQLAZhuQw/s7Z33QeZokNGtoJ+S08 jLmj+NOilYMdGXHQHEh0QcDpQh22MmdIWcbevZ4AFJEi7ZR/pfjbili7/ dOlrbNC6fgDnypLtqP/VfV+FZeGxSJkXjmwhx+H9vFlPV3kCMD9cUTMor DDCPuPzedjRpGMqj5ZiVfBCQLA2YWbfYodc743CO9Us45AeJMIofib7zu w==; X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="372083359" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="372083359" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 23:57:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="892489907" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="892489907" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 23:56:41 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 22F1B1209F7; Wed, 27 Sep 2023 09:41:26 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Tianshu Qiu , Bingbu Cao , Tomi Valkeinen , Jacopo Mondi , Rui Miguel Silva , Martin Kepplinger Subject: [PATCH v6 03/13] media: ccs: Correctly initialise try compose rectangle Date: Wed, 27 Sep 2023 09:41:10 +0300 Message-Id: <20230927064120.367561-4-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927064120.367561-1-sakari.ailus@linux.intel.com> References: <20230927064120.367561-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Initialise the try sink compose rectangle size to the sink compose rectangle for binner and scaler sub-devices. This was missed due to the faulty condition that lead to the compose rectangles to be initialised for the pixel array sub-device where it is not relevant. Fixes: ccfc97bdb5ae ("[media] smiapp: Add driver") Cc: stable@vger.kernel.org Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ccs/ccs-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c index 6a8116454f87..022e8712d48e 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -3097,7 +3097,7 @@ static int ccs_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) try_fmt->code = sensor->internal_csi_format->code; try_fmt->field = V4L2_FIELD_NONE; - if (ssd != sensor->pixel_array) + if (ssd == sensor->pixel_array) continue; try_comp = v4l2_subdev_get_try_compose(sd, fh->state, i); -- 2.39.2