From nobody Fri Dec 19 16:07:59 2025 Received: from mx.gpxsee.org (mx.gpxsee.org [37.205.14.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8681148844; Fri, 26 Apr 2024 14:25:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.205.14.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714141537; cv=none; b=J7qD66Z0WRAwpMuTg6UfmT3Iv3I4noDFDvyHKjgAGea9n12rcUpKcSTLxrqvAv65jYB/m+vWcg0C8egg2J2Xzp7Kbz6DelPuvABwTmP0V9dv4T/NfKc01XWEuK1RNp4heRZ+EOpMySJ2H9zwCYO5wKVyB+LxMV2Q70H6AJDH69Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714141537; c=relaxed/simple; bh=DU6s0vTQxydn1ZYnilNR1xt3FPg4W4iYH0LBzNC5xwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=P0W4uuh37rTu6ohsWQibvqCWlEkXrHYmFrI2XcNznx7WdDsOd/e7rgzcfNyXG9iDym7ob05a8wF7MMBU0f86rJs+l8+denrHTUbcFz4Q03PvGIejCQBQY3IzloE9uCPMQqy8RtS5F0s1gfa1zeoupNTVQsHIoumTi+ce4s58J2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gpxsee.org; spf=pass smtp.mailfrom=gpxsee.org; arc=none smtp.client-ip=37.205.14.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gpxsee.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gpxsee.org Received: from mgb4.. (unknown [62.77.71.229]) by mx.gpxsee.org (Postfix) with ESMTPSA id 71D4A4270C; Fri, 26 Apr 2024 16:16:26 +0200 (CEST) From: tumic@gpxsee.org To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Martin=20T=C5=AFma?= Subject: [PATCH v5 3/4] media: mgb4: Fixed signal frame rate limit handling Date: Fri, 26 Apr 2024 16:16:18 +0200 Message-ID: <20240426141619.8866-4-tumic@gpxsee.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240426141619.8866-1-tumic@gpxsee.org> References: <20240426141619.8866-1-tumic@gpxsee.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Martin T=C5=AFma Change the default DV timings for the outputs to produce a better signal le= ss "crippled" by the frame rate limiting. While the individual values are now different, the resulting signal still matches the same default display as b= efore. Additionaly fix the corner case when the frame rate limit is set to zero ca= using a "divide by zero" kernel panic. Signed-off-by: Martin T=C5=AFma --- drivers/media/pci/mgb4/mgb4_sysfs_out.c | 9 +++++---- drivers/media/pci/mgb4/mgb4_vout.c | 12 ++++++------ drivers/media/pci/mgb4/mgb4_vout.h | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/media/pci/mgb4/mgb4_sysfs_out.c b/drivers/media/pci/mg= b4/mgb4_sysfs_out.c index f67ff2a48329..573aa61c69d4 100644 --- a/drivers/media/pci/mgb4/mgb4_sysfs_out.c +++ b/drivers/media/pci/mgb4/mgb4_sysfs_out.c @@ -229,9 +229,9 @@ static ssize_t frame_rate_show(struct device *dev, struct video_device *vdev =3D to_video_device(dev); struct mgb4_vout_dev *voutdev =3D video_get_drvdata(vdev); u32 period =3D mgb4_read_reg(&voutdev->mgbdev->video, - voutdev->config->regs.frame_period); + voutdev->config->regs.frame_limit); =20 - return sprintf(buf, "%u\n", MGB4_HW_FREQ / period); + return sprintf(buf, "%u\n", period ? MGB4_HW_FREQ / period : 0); } =20 /* @@ -245,14 +245,15 @@ static ssize_t frame_rate_store(struct device *dev, struct video_device *vdev =3D to_video_device(dev); struct mgb4_vout_dev *voutdev =3D video_get_drvdata(vdev); unsigned long val; - int ret; + int limit, ret; =20 ret =3D kstrtoul(buf, 10, &val); if (ret) return ret; =20 + limit =3D val ? MGB4_HW_FREQ / val : 0; mgb4_write_reg(&voutdev->mgbdev->video, - voutdev->config->regs.frame_period, MGB4_HW_FREQ / val); + voutdev->config->regs.frame_limit, limit); =20 return count; } diff --git a/drivers/media/pci/mgb4/mgb4_vout.c b/drivers/media/pci/mgb4/mg= b4_vout.c index d98b6e87d71f..998edcbd9723 100644 --- a/drivers/media/pci/mgb4/mgb4_vout.c +++ b/drivers/media/pci/mgb4/mgb4_vout.c @@ -665,12 +665,12 @@ static void fpga_init(struct mgb4_vout_dev *voutdev) mgb4_write_reg(video, regs->config, 0x00000011); mgb4_write_reg(video, regs->resolution, (DEFAULT_WIDTH << 16) | DEFAULT_HEIGHT); - mgb4_write_reg(video, regs->hsync, 0x00102020); - mgb4_write_reg(video, regs->vsync, 0x40020202); - mgb4_write_reg(video, regs->frame_period, DEFAULT_PERIOD); + mgb4_write_reg(video, regs->hsync, 0x00283232); + mgb4_write_reg(video, regs->vsync, 0x40141F1E); + mgb4_write_reg(video, regs->frame_limit, DEFAULT_PERIOD); mgb4_write_reg(video, regs->padding, 0x00000000); =20 - voutdev->freq =3D mgb4_cmt_set_vout_freq(voutdev, 70000 >> 1) << 1; + voutdev->freq =3D mgb4_cmt_set_vout_freq(voutdev, 61150 >> 1) << 1; =20 mgb4_write_reg(video, regs->config, (voutdev->config->id + MGB4_VIN_DEVICES) << 2 | 1 << 4); @@ -696,8 +696,8 @@ static void debugfs_init(struct mgb4_vout_dev *voutdev) voutdev->regs[3].offset =3D voutdev->config->regs.hsync; voutdev->regs[4].name =3D "VIDEO_PARAMS_2"; voutdev->regs[4].offset =3D voutdev->config->regs.vsync; - voutdev->regs[5].name =3D "FRAME_PERIOD"; - voutdev->regs[5].offset =3D voutdev->config->regs.frame_period; + voutdev->regs[5].name =3D "FRAME_LIMIT"; + voutdev->regs[5].offset =3D voutdev->config->regs.frame_limit; voutdev->regs[6].name =3D "PADDING_PIXELS"; voutdev->regs[6].offset =3D voutdev->config->regs.padding; if (has_timeperframe(video)) { diff --git a/drivers/media/pci/mgb4/mgb4_vout.h b/drivers/media/pci/mgb4/mg= b4_vout.h index ab9b58b1deb7..adc8fe1e7ae6 100644 --- a/drivers/media/pci/mgb4/mgb4_vout.h +++ b/drivers/media/pci/mgb4/mgb4_vout.h @@ -19,7 +19,7 @@ struct mgb4_vout_regs { u32 config; u32 status; u32 resolution; - u32 frame_period; + u32 frame_limit; u32 hsync; u32 vsync; u32 padding; --=20 2.44.0