From: Adam Ford <aford173@gmail.com>
To: linux-omap@vger.kernel.org
Cc: adam.ford@logicpd.com, "Adam Ford" <aford173@gmail.com>,
"Tomi Valkeinen" <tomi.valkeinen@ti.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Tony Lindgren" <tony@atomide.com>,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] drm/omap: Migrate minimum FCK/PCK ratio from Kconfig to dts
Date: Fri, 10 May 2019 14:42:29 -0500 [thread overview]
Message-ID: <20190510194229.20628-1-aford173@gmail.com> (raw)
Currently the source code is compiled using hard-coded values
from CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK. This patch allows this
clock divider value to be moved to the device tree and be changed
without having to recompile the kernel.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
index cd02516a40b6..42449d07c47e 100644
--- a/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
+++ b/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
@@ -40,7 +40,7 @@ Required properties:
Optional properties:
- max-memory-bandwidth: Input memory (from main memory to dispc) bandwidth limit
in bytes per second
-
+- min-fck-pck-ratio: Make sure that DISPC FCK is at least n x PCK
RFBI
----
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4043ecb38016..bf84a8487aae 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -751,7 +751,7 @@
#size-cells = <1>;
ranges;
- dispc@48050400 {
+ dispc: dispc@48050400 {
compatible = "ti,omap3-dispc";
reg = <0x48050400 0x400>;
interrupts = <25>;
diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig
index f24ebf7f61dd..d0666edcdf2a 100644
--- a/drivers/gpu/drm/omapdrm/dss/Kconfig
+++ b/drivers/gpu/drm/omapdrm/dss/Kconfig
@@ -102,24 +102,6 @@ config OMAP2_DSS_DSI
See http://www.mipi.org/ for DSI specifications.
-config OMAP2_DSS_MIN_FCK_PER_PCK
- int "Minimum FCK/PCK ratio (for scaling)"
- range 0 32
- default 0
- help
- This can be used to adjust the minimum FCK/PCK ratio.
-
- With this you can make sure that DISPC FCK is at least
- n x PCK. Video plane scaling requires higher FCK than
- normally.
-
- If this is set to 0, there's no extra constraint on the
- DISPC FCK. However, the FCK will at minimum be
- 2xPCK (if active matrix) or 3xPCK (if passive matrix).
-
- Max FCK is 173MHz, so this doesn't work if your PCK
- is very high.
-
config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
bool "Sleep 20ms after VENC reset"
default y
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index ba82d916719c..09a130c53da2 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -198,6 +198,9 @@ struct dispc_device {
/* DISPC_CONTROL & DISPC_CONFIG lock*/
spinlock_t control_lock;
+
+ /* Optional min-fck-pck-ratio */
+ u32 min_fck_per_pck;
};
enum omap_color_component {
@@ -3683,15 +3686,8 @@ bool dispc_div_calc(struct dispc_device *dispc, unsigned long dispc_freq,
unsigned long pck, lck;
unsigned long lck_max;
unsigned long pckd_hw_min, pckd_hw_max;
- unsigned int min_fck_per_pck;
unsigned long fck;
-#ifdef CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
- min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
-#else
- min_fck_per_pck = 0;
-#endif
-
pckd_hw_min = dispc->feat->min_pcd;
pckd_hw_max = 255;
@@ -3723,7 +3719,7 @@ bool dispc_div_calc(struct dispc_device *dispc, unsigned long dispc_freq,
else
fck = lck;
- if (fck < pck * min_fck_per_pck)
+ if (fck < pck * dispc->min_fck_per_pck)
continue;
if (func(lckd, pckd, lck, pck, data))
@@ -4826,6 +4822,8 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
}
}
+ of_property_read_u32(np, "min-fck-pck-ratio", &dispc->min_fck_per_pck);
+
r = dispc_init_gamma_tables(dispc);
if (r)
goto err_free;
--
2.17.1
next reply other threads:[~2019-05-10 19:42 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 19:42 Adam Ford [this message]
2019-05-28 11:11 ` [PATCH] drm/omap: Migrate minimum FCK/PCK ratio from Kconfig to dts Tomi Valkeinen
2019-05-28 15:09 ` Adam Ford
2019-05-28 15:20 ` H. Nikolaus Schaller
2019-05-28 15:53 ` Tomi Valkeinen
2019-05-31 12:13 ` Adam Ford
2019-09-25 20:51 ` Adam Ford
2019-09-26 6:55 ` Tomi Valkeinen
2019-09-26 14:12 ` Adam Ford
2019-09-27 6:21 ` Tomi Valkeinen
2019-09-27 12:13 ` Adam Ford
2019-09-27 13:45 ` Tomi Valkeinen
2019-09-27 7:55 ` Tomi Valkeinen
2019-09-27 12:33 ` Adam Ford
2019-09-27 13:47 ` Tomi Valkeinen
2019-09-27 15:37 ` Tero Kristo
2019-09-27 15:47 ` Tomi Valkeinen
2019-09-30 6:45 ` Tomi Valkeinen
2019-09-30 8:53 ` Tero Kristo
2019-09-30 12:41 ` Adam Ford
2019-09-30 12:47 ` Tero Kristo
2019-09-30 13:17 ` Adam Ford
2019-09-30 13:35 ` Tomi Valkeinen
2019-09-30 13:38 ` H. Nikolaus Schaller
2019-09-30 13:54 ` Adam Ford
2019-09-30 14:04 ` Adam Ford
2019-09-30 14:12 ` Adam Ford
2019-09-30 14:20 ` Tomi Valkeinen
2019-09-30 14:27 ` Tomi Valkeinen
2019-09-30 14:56 ` H. Nikolaus Schaller
2019-09-30 15:10 ` Adam Ford
2019-09-30 17:48 ` Tero Kristo
2019-10-01 5:07 ` Tomi Valkeinen
2019-10-01 5:12 ` Tero Kristo
2019-10-01 8:12 ` Tero Kristo
2019-10-01 9:31 ` Tomi Valkeinen
2019-10-01 13:06 ` Adam Ford
2019-10-01 13:14 ` Tomi Valkeinen
2019-09-25 21:26 ` Andrew F. Davis
2019-06-13 20:22 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190510194229.20628-1-aford173@gmail.com \
--to=aford173@gmail.com \
--cc=adam.ford@logicpd.com \
--cc=airlied@linux.ie \
--cc=bcousson@baylibre.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).