From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 45396C31E54 for ; Sun, 16 Jun 2019 18:23:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B39720866 for ; Sun, 16 Jun 2019 18:23:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Idkd9WkQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726266AbfFPSXO (ORCPT ); Sun, 16 Jun 2019 14:23:14 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:34113 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbfFPSXO (ORCPT ); Sun, 16 Jun 2019 14:23:14 -0400 Received: by mail-lj1-f196.google.com with SMTP id p17so7156207ljg.1 for ; Sun, 16 Jun 2019 11:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oUTcBAx57mlmfcsg0WZGllIlr8VYTxNCliDCkRUcF48=; b=Idkd9WkQoznZLXsLJYiMtUC/+8LmwPEHcX1y5indHdtIGK7f5zNATWhSvmHacr7Hnj jHzu0L5tsQsKQMYJyS9RXECo732iS7RYbnzQKE2W/oMBXsmw8/VWVHVxv4I5AdSLznWJ 3Vd6RhHUxAkrrr9pi/bSGOZJOP0rgnnI6us9MtmzzHBCBC9fAnc/NtU/gscrXE1zz6j9 BgbCiGKUSvGa1120AL2nyI05mBkUEg2scFfYMyGRtZph7Hbs9VVZeB1lBWyIvlQF/gnH 0YaorGMuJCud0tqrq2m6C8v4UuTMPVqXEtNFfXwo1qM//kQPQV+Mmf2/QMnOPky4t5Ph tXWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oUTcBAx57mlmfcsg0WZGllIlr8VYTxNCliDCkRUcF48=; b=MSFzFajb8GJ1eBDa0KmcS8ks5BYah47fqxeSsxMycemzeYeZKY2NFToDtZ6oh24vNh luHASEjCSNcDDfZFF+oVtasSMyTGXQ2vgdyvfM8/v60Bh6g1GbvdWUpbNbtASiuuyBFt JPzdXVL84S/BC/u4NmINuM76u/G0qe88jsIfiq2i9zP0P2VqWLtPw680GNK8DibN+ALQ WpUF7WYRsjrk0A4N8luXXgnYHGAlif9nYDcNN9/2AjtbMxlKCQe6ZKlI4QxXLcYy6C1F VzuvhbtT3X7FW3VPHuI9oPzb/O16KzFrli7l6d9wunoQX8eqWQ8X3fY0kQifMb0GWs4E GxUA== X-Gm-Message-State: APjAAAVYmhWLlj9EbpJ7fvqeuGMDVa8AT0fv/qDYAfSfnpVFcZH16MnT ApCdvm+TliVQXiP2+jifgiEE5UYVbhI= X-Google-Smtp-Source: APXvYqxEuYScq7KmJGfDJyEWByz5OWpfw+8P/oMeKvdjJby5zHDy+Rovm4GhBGWsh89rQWWvX4vx0Q== X-Received: by 2002:a2e:654d:: with SMTP id z74mr41881462ljb.111.1560709391396; Sun, 16 Jun 2019 11:23:11 -0700 (PDT) Received: from localhost.localdomain ([178.74.2.49]) by smtp.gmail.com with ESMTPSA id z85sm1714081ljb.101.2019.06.16.11.23.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 11:23:10 -0700 (PDT) From: Johan Korsnes To: linux-media@vger.kernel.org Cc: Johan Korsnes Subject: [PATCH v2 3/9] media: vivid: add display present control Date: Sun, 16 Jun 2019 11:22:12 -0700 Message-Id: <20190616182218.37726-4-johan.korsnes@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190616182218.37726-1-johan.korsnes@gmail.com> References: <20190616182218.37726-1-johan.korsnes@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add a custom control for selecting the presence of a display connected to the active output. This control is part of an effort to implement proper HDMI (dis)connect behavior for vivid. Signed-off-by: Johan Korsnes --- drivers/media/platform/vivid/vivid-core.c | 3 +++ drivers/media/platform/vivid/vivid-core.h | 2 ++ drivers/media/platform/vivid/vivid-ctrls.c | 18 ++++++++++++++++++ drivers/media/platform/vivid/vivid-vid-out.c | 6 ++++++ 4 files changed, 29 insertions(+) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 85e6aaf7bf0d..b1d5332b363f 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -730,6 +730,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) for (i = 0; i < dev->num_outputs; i++) { dev->output_type[i] = ((output_types[inst] >> i) & 1) ? HDMI : SVID; dev->output_name_counter[i] = out_type_counter[dev->output_type[i]]++; + dev->display_present[i] = true; } dev->has_audio_outputs = out_type_counter[SVID]; if (out_type_counter[HDMI] == 16) { @@ -1038,6 +1039,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) goto unreg_dev; /* enable/disable interface specific controls */ + if (dev->num_outputs && dev->output_type[0] != HDMI) + v4l2_ctrl_activate(dev->ctrl_display_present, false); if (dev->num_inputs && dev->input_type[0] != HDMI) { v4l2_ctrl_activate(dev->ctrl_dv_timings_signal_mode, false); v4l2_ctrl_activate(dev->ctrl_dv_timings, false); diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index a18fd19215b6..24104df6c444 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h @@ -237,6 +237,7 @@ struct vivid_dev { struct v4l2_ctrl *ctrl_dv_timings_signal_mode; struct v4l2_ctrl *ctrl_dv_timings; }; + struct v4l2_ctrl *ctrl_display_present; struct v4l2_ctrl *ctrl_has_crop_cap; struct v4l2_ctrl *ctrl_has_compose_cap; struct v4l2_ctrl *ctrl_has_scaler_cap; @@ -361,6 +362,7 @@ struct vivid_dev { u8 *scaled_line; u8 *blended_line; unsigned cur_scaled_line; + bool display_present[MAX_OUTPUTS]; /* Output Overlay */ void *fb_vbase_out; diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c index 74b2c92fbfa0..67a330f15552 100644 --- a/drivers/media/platform/vivid/vivid-ctrls.c +++ b/drivers/media/platform/vivid/vivid-ctrls.c @@ -68,6 +68,7 @@ #define VIVID_CID_PERCENTAGE_FILL (VIVID_CID_VIVID_BASE + 41) #define VIVID_CID_REDUCED_FPS (VIVID_CID_VIVID_BASE + 42) #define VIVID_CID_HSV_ENC (VIVID_CID_VIVID_BASE + 43) +#define VIVID_CID_DISPLAY_PRESENT (VIVID_CID_VIVID_BASE + 44) #define VIVID_CID_STD_SIGNAL_MODE (VIVID_CID_VIVID_BASE + 60) #define VIVID_CID_STANDARD (VIVID_CID_VIVID_BASE + 61) @@ -944,6 +945,12 @@ static int vivid_vid_out_s_ctrl(struct v4l2_ctrl *ctrl) if (dev->loop_video) vivid_send_source_change(dev, HDMI); break; + case VIVID_CID_DISPLAY_PRESENT: + if (dev->output_type[dev->output] != HDMI) + break; + + dev->display_present[dev->output] = ctrl->val; + break; } return 0; } @@ -982,6 +989,15 @@ static const struct v4l2_ctrl_config vivid_ctrl_has_scaler_out = { .step = 1, }; +static const struct v4l2_ctrl_config vivid_ctrl_display_present = { + .ops = &vivid_vid_out_ctrl_ops, + .id = VIVID_CID_DISPLAY_PRESENT, + .name = "Display Present", + .type = V4L2_CTRL_TYPE_BOOLEAN, + .max = 1, + .def = 1, + .step = 1, +}; /* Streaming Controls */ @@ -1587,6 +1603,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap, dev->ctrl_tx_mode = v4l2_ctrl_new_std_menu(hdl_vid_out, NULL, V4L2_CID_DV_TX_MODE, V4L2_DV_TX_MODE_HDMI, 0, V4L2_DV_TX_MODE_HDMI); + dev->ctrl_display_present = v4l2_ctrl_new_custom(hdl_vid_out, + &vivid_ctrl_display_present, NULL); } if ((dev->has_vid_cap && dev->has_vid_out) || (dev->has_vbi_cap && dev->has_vbi_out)) diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 9350ca65dd91..148b663a6075 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1094,6 +1094,12 @@ int vidioc_s_output(struct file *file, void *priv, unsigned o) dev->vbi_out_dev.tvnorms = dev->vid_out_dev.tvnorms; vivid_update_format_out(dev); + + v4l2_ctrl_activate(dev->ctrl_display_present, vivid_is_hdmi_out(dev)); + if (vivid_is_hdmi_out(dev)) + v4l2_ctrl_s_ctrl(dev->ctrl_display_present, + dev->display_present[dev->output]); + return 0; } -- 2.19.1