From patchwork Fri Apr 5 14:13:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pawe=C5=82_Anikiel?= X-Patchwork-Id: 786640 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0488B16EC1B for ; Fri, 5 Apr 2024 14:15:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712326507; cv=none; b=Z9QX/XJqKGHrPnLcrsX69CvGtSoZEtrQhwXyNrN8FiNWbEpkEOQ6ge7TFblXxdWURhoR3B4G7YNN4mI+jDeBFizbyE+XIWQrsUwiJKNnhsQyn/OkEm2yo6d0+JoGYsu9RMqmIGikjD5T2WqPWafLewVU/TL5bd2jrshZlpt9S10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712326507; c=relaxed/simple; bh=6EehccEvTPWYOq7+XxW7U39Z7ElCZmB+5qet67lPQQs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Mhav7C/nyF21LTTjWzyygF7bRyELOzB3vvI5As4FCJxYvrtke1pqCyhHwn7O+n1EWeThAhu/Uih+qKoYWmeo3wh6CMyHhffqeDOJzru9oMvifnIVlODgmmV52nvXSA3kupix5DRPBchQgH1x0mypcHrYZBj5orVPvjZ/2V41+kE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--panikiel.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=r5l6/Ip/; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--panikiel.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="r5l6/Ip/" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-343d7cd8f46so579485f8f.2 for ; Fri, 05 Apr 2024 07:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712326504; x=1712931304; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=EB1OqCeM+zzEWfmV9H/3BRd83N3O3aUGhb7gLO7v4Gs=; b=r5l6/Ip/rFUB8dW3ahq9kAitPKmB9Lngsi3ub2sxepQil40+4ROeQkPAvQUAWFsgc7 xfoIezE6JCZf0nD0tTKsr9FE45OVKMVrhqf8oRuZalW7p9cqKECi7SCf4r7kMhhk8PV9 VtZ4vBAVwJ+TSwkOejCwdapx0zwPQulR1jxfEsZBN3dv9HHPZDEYMbfnOBVLak/cs64X 6AFdmUBQRJc2rQvdeWkjbNOXH8VZhBpTs3e2QI1XiCvBmj2zzUk/vpvXc2CTtASlaGyj 0X/Sbeaud4Q3qWHRDdxmj/+HF6J+DOfqAjBL6IZnhhImCMxKfsirjt/VC9J+dVQyqDmL 0mZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712326504; x=1712931304; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=EB1OqCeM+zzEWfmV9H/3BRd83N3O3aUGhb7gLO7v4Gs=; b=bZDXm2jtW43Jy09FLyZrs0oKuq3Of1rZywkDyzQl+U4qgQpZ1f+HAtwrH9xzjRk5AL E30G9BU4hvJDtTPAKa1Rw74zjYG/NBUMlo2PWLBeWNHOxpSVX+ZRSaxahlPqrrKMdGWv AP0+DyCoXcQ4bGGX1oHD5uL51NDENgKR5d7tyTHRRBJmzWPDKqfK0bdxaXmdMY4TJCf5 ZHLVN2hRIkacKDWvBLfrMdgEu1kzvRfSy2fs1/aa7ll0nhg9ATgTKo2iSmTmzTMqzBMl j+N+yk+atr1dmj2PWBznqHzOkQxUk4zHIIogGS73zqVxlyAV/SmGcRJVU75F/l+UW3QC +htg== X-Gm-Message-State: AOJu0Yyu0nG0fFBB9vnIzJHL7Msdbd52b4TU3pMctqJQJuXI7z//IIJ3 CMVSDEt6nzKrhYg97Oy1aQXYmZUXAI+L6EcC4QzuZnugmoMBx83BGOFvF3lapxckBQoHI1eMbiI dBGJRHUijeg== X-Google-Smtp-Source: AGHT+IHxUh/sNELzePmUjUKXOONpTWRH6C10MHQYsitlB4/bEok8pDIcPZmqe/e/AmmgnCRzPUYVo9trVTS96A== X-Received: from szatan.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:2d83]) (user=panikiel job=sendgmr) by 2002:a05:6000:1d9c:b0:343:ce9e:3732 with SMTP id bk28-20020a0560001d9c00b00343ce9e3732mr2847wrb.11.1712326504331; Fri, 05 Apr 2024 07:15:04 -0700 (PDT) Date: Fri, 5 Apr 2024 14:13:57 +0000 In-Reply-To: <20240405141411.1807189-1-panikiel@google.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240405141411.1807189-1-panikiel@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240405141411.1807189-3-panikiel@google.com> Subject: [PATCH 02/16] media: i2c: adv748x: Switch dv timing callbacks to pad ops From: " =?utf-8?q?Pawe=C5=82_Anikiel?= " To: kieran.bingham@ideasonboard.com, mchehab@kernel.org, hverkuil-cisco@xs4all.nl, tharvey@gateworks.com, niklas.soderlund@ragnatech.se, prabhakar.csengg@gmail.com, charles-antoine.couret@nexvision.fr, thierry.reding@gmail.com, jonathanh@nvidia.com, skomatineni@nvidia.com, luca.ceresoli@bootlin.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, chromeos-krk-upstreaming@google.com, " =?utf-8?q?Pawe=C5=82_Anikiel?= " Change all (s|g|query)_dv_timings subdev callbacks to include a pad argument. Signed-off-by: Paweł Anikiel --- drivers/media/i2c/adv748x/adv748x-hdmi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/adv748x/adv748x-hdmi.c index ec151dc69c23..a4db9bae5f79 100644 --- a/drivers/media/i2c/adv748x/adv748x-hdmi.c +++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c @@ -214,7 +214,7 @@ static int adv748x_hdmi_set_video_timings(struct adv748x_state *state, * v4l2_subdev_video_ops */ -static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd, +static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_dv_timings *timings) { struct adv748x_hdmi *hdmi = adv748x_sd_to_hdmi(sd); @@ -254,7 +254,7 @@ static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd, return ret; } -static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd, +static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_dv_timings *timings) { struct adv748x_hdmi *hdmi = adv748x_sd_to_hdmi(sd); @@ -269,7 +269,7 @@ static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd, return 0; } -static int adv748x_hdmi_query_dv_timings(struct v4l2_subdev *sd, +static int adv748x_hdmi_query_dv_timings(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_dv_timings *timings) { struct adv748x_hdmi *hdmi = adv748x_sd_to_hdmi(sd); @@ -392,9 +392,6 @@ static int adv748x_hdmi_g_pixelaspect(struct v4l2_subdev *sd, } static const struct v4l2_subdev_video_ops adv748x_video_ops_hdmi = { - .s_dv_timings = adv748x_hdmi_s_dv_timings, - .g_dv_timings = adv748x_hdmi_g_dv_timings, - .query_dv_timings = adv748x_hdmi_query_dv_timings, .g_input_status = adv748x_hdmi_g_input_status, .s_stream = adv748x_hdmi_s_stream, .g_pixelaspect = adv748x_hdmi_g_pixelaspect, @@ -413,7 +410,7 @@ static int adv748x_hdmi_propagate_pixelrate(struct adv748x_hdmi *hdmi) if (!tx) return -ENOLINK; - adv748x_hdmi_query_dv_timings(&hdmi->sd, &timings); + adv748x_hdmi_query_dv_timings(&hdmi->sd, 0, &timings); return adv748x_csi2_set_pixelrate(tx, timings.bt.pixelclock); } @@ -610,6 +607,9 @@ static const struct v4l2_subdev_pad_ops adv748x_pad_ops_hdmi = { .get_fmt = adv748x_hdmi_get_format, .get_edid = adv748x_hdmi_get_edid, .set_edid = adv748x_hdmi_set_edid, + .s_dv_timings = adv748x_hdmi_s_dv_timings, + .g_dv_timings = adv748x_hdmi_g_dv_timings, + .query_dv_timings = adv748x_hdmi_query_dv_timings, .dv_timings_cap = adv748x_hdmi_dv_timings_cap, .enum_dv_timings = adv748x_hdmi_enum_dv_timings, }; @@ -734,7 +734,7 @@ int adv748x_hdmi_init(struct adv748x_hdmi *hdmi) struct v4l2_dv_timings cea1280x720 = V4L2_DV_BT_CEA_1280X720P30; int ret; - adv748x_hdmi_s_dv_timings(&hdmi->sd, &cea1280x720); + adv748x_hdmi_s_dv_timings(&hdmi->sd, 0, &cea1280x720); /* Initialise a default 16:9 aspect ratio */ hdmi->aspect_ratio.numerator = 16;