From patchwork Fri Feb 2 13:00:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 10196597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 676B560362 for ; Fri, 2 Feb 2018 13:00:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EBE528E4A for ; Fri, 2 Feb 2018 13:00:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 439EA28E4E; Fri, 2 Feb 2018 13:00:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C407228E4A for ; Fri, 2 Feb 2018 13:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751643AbeBBNAi (ORCPT ); Fri, 2 Feb 2018 08:00:38 -0500 Received: from lb1-smtp-cloud7.xs4all.net ([194.109.24.24]:57863 "EHLO lb1-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbeBBNAh (ORCPT ); Fri, 2 Feb 2018 08:00:37 -0500 Received: from [IPv6:2001:420:44c1:2579:2866:9bdc:1506:111e] ([IPv6:2001:420:44c1:2579:2866:9bdc:1506:111e]) by smtp-cloud7.xs4all.net with ESMTPA id haxEeZ3Vc3A62haxIeUKnp; Fri, 02 Feb 2018 14:00:36 +0100 To: Linux Media Mailing List From: Hans Verkuil Subject: [PATCH] vimc: fix control event handling Cc: Helen Koike Message-ID: <5fa05ebf-0bb4-3fac-ed5e-a5283889c67c@xs4all.nl> Date: Fri, 2 Feb 2018 14:00:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-US X-CMAE-Envelope: MS4wfPSz0l7mKt7H4+OpXzubL7OGyV/839a10JngckIBXF4/LSpw4aNgEgoQ7GbjWk5HjR3CYPoZ0E917gMb49LS55cTvUz/P5VXkLlmKJzaELqIhRNdoX/G q37sPSgEM741m4+d1ewrSc7G4oHoE6/Gpbac8jXYsxbUqT5Sg1w+hJ0CyfxU1kA7DslwCZo9Y5I2aWb4q5oyt+3Tfy5zcs/KfU2wXL6kJIz9fHmdLdulXAUy LH+vtDrMQSLvFdNMk1b/bIUkOCHYDCffTyNLZv0mrxIIzcdjm3m8s7NTJsmx38A0Wju9Lu/9V8O93UOEjrCI10vXgAfuQYrmVOXi0kNlYqE= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The sensor subdev didn't handle control events. Add support for this. Found with v4l2-compliance. Signed-off-by: Hans Verkuil Acked-by: Helen Koike diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c index 9d63c84a9876..617415c224fe 100644 --- a/drivers/media/platform/vimc/vimc-common.c +++ b/drivers/media/platform/vimc/vimc-common.c @@ -434,7 +434,9 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, v4l2_set_subdevdata(sd, ved); /* Expose this subdev to user space */ - sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE; + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + if (sd->ctrl_handler) + sd->flags |= V4L2_SUBDEV_FL_HAS_EVENTS; /* Initialize the media entity */ ret = media_entity_pads_init(&sd->entity, num_pads, ved->pads); diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c index 457e211514c6..54184cd9e0ff 100644 --- a/drivers/media/platform/vimc/vimc-sensor.c +++ b/drivers/media/platform/vimc/vimc-sensor.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -284,11 +285,18 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable) return 0; } +static struct v4l2_subdev_core_ops vimc_sen_core_ops = { + .log_status = v4l2_ctrl_subdev_log_status, + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .unsubscribe_event = v4l2_event_subdev_unsubscribe, +}; + static const struct v4l2_subdev_video_ops vimc_sen_video_ops = { .s_stream = vimc_sen_s_stream, }; static const struct v4l2_subdev_ops vimc_sen_ops = { + .core = &vimc_sen_core_ops, .pad = &vimc_sen_pad_ops, .video = &vimc_sen_video_ops, };