dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Maxime Ripard
	<maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>,
	David Airlie <airlied-cv59FeDIM0c@public.gmane.org>,
	Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
	Maarten Lankhorst
	<maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	Sean Paul <sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org>,
	Thomas Petazzoni
	<thomas.petazzoni-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	Daniel Vetter <daniel-/w4YWyX8dFk@public.gmane.org>,
	Paul Kocialkowski
	<paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH v4 18/22] drm/sun4i: frontend: Add a quirk structure
Date: Wed,  5 Dec 2018 09:36:59 +0100	[thread overview]
Message-ID: <20181205083703.21488-19-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20181205083703.21488-1-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>

From: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>

The ACCESS_CTRL bit is not found on all the variants of the frontend, so
let's introduce a structure that will hold whether or not we need to set
it, and associate it with the compatible.

This will be extended for further similar quirks later on.

Signed-off-by: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
---
 drivers/gpu/drm/sun4i/sun4i_frontend.c | 21 +++++++++++++++++----
 drivers/gpu/drm/sun4i/sun4i_frontend.h |  6 ++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.c b/drivers/gpu/drm/sun4i/sun4i_frontend.c
index 88ac77518610..6636b1998a76 100644
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.c
@@ -10,6 +10,7 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
@@ -75,9 +76,10 @@ static void sun4i_frontend_scaler_init(struct sun4i_frontend *frontend)
 {
 	int i;
 
-	regmap_write_bits(frontend->regs, SUN4I_FRONTEND_FRM_CTRL_REG,
-			  SUN4I_FRONTEND_FRM_CTRL_COEF_ACCESS_CTRL,
-			  SUN4I_FRONTEND_FRM_CTRL_COEF_ACCESS_CTRL);
+	if (frontend->data->has_coef_access_ctrl)
+		regmap_write_bits(frontend->regs, SUN4I_FRONTEND_FRM_CTRL_REG,
+				  SUN4I_FRONTEND_FRM_CTRL_COEF_ACCESS_CTRL,
+				  SUN4I_FRONTEND_FRM_CTRL_COEF_ACCESS_CTRL);
 
 	for (i = 0; i < 32; i++) {
 		regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_HORZCOEF0_REG(i),
@@ -553,6 +555,10 @@ static int sun4i_frontend_bind(struct device *dev, struct device *master,
 	frontend->dev = dev;
 	frontend->node = dev->of_node;
 
+	frontend->data = of_device_get_match_data(dev);
+	if (!frontend->data)
+		return -ENODEV;
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	regs = devm_ioremap_resource(dev, res);
 	if (IS_ERR(regs))
@@ -665,8 +671,15 @@ static const struct dev_pm_ops sun4i_frontend_pm_ops = {
 	.runtime_suspend	= sun4i_frontend_runtime_suspend,
 };
 
+static const struct sun4i_frontend_data sun8i_a33_frontend = {
+	.has_coef_access_ctrl	= true,
+};
+
 const struct of_device_id sun4i_frontend_of_table[] = {
-	{ .compatible = "allwinner,sun8i-a33-display-frontend" },
+	{
+		.compatible = "allwinner,sun8i-a33-display-frontend",
+		.data = &sun8i_a33_frontend
+	},
 	{ }
 };
 EXPORT_SYMBOL(sun4i_frontend_of_table);
diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.h b/drivers/gpu/drm/sun4i/sun4i_frontend.h
index 235109199b9d..01e68bb11c98 100644
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.h
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.h
@@ -112,6 +112,10 @@ struct drm_plane;
 struct regmap;
 struct reset_control;
 
+struct sun4i_frontend_data {
+	bool	has_coef_access_ctrl;
+};
+
 struct sun4i_frontend {
 	struct list_head	list;
 	struct device		*dev;
@@ -122,6 +126,8 @@ struct sun4i_frontend {
 	struct clk		*ram_clk;
 	struct regmap		*regs;
 	struct reset_control	*reset;
+
+	const struct sun4i_frontend_data	*data;
 };
 
 extern const struct of_device_id sun4i_frontend_of_table[];
-- 
2.19.2

  parent reply	other threads:[~2018-12-05  8:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-05  8:36 [PATCH v4 00/22] drm/sun4i: Support for linear and tiled YUV formats with the frontend Paul Kocialkowski
2018-12-05  8:36 ` [PATCH v4 10/22] drm/sun4i: frontend: Add support for planar YUV input formats Paul Kocialkowski
     [not found] ` <20181205083703.21488-1-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
2018-12-05  8:36   ` [PATCH v4 01/22] drm/fourcc: Add format info helpers for checking YUV planes disposition Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 02/22] drm/fourcc: Add format info helpers for checking YUV sub-sampling Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 03/22] drm/sun4i: backend: Use explicit fourcc helpers for packed YUV422 check Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 04/22] drm/sun4i: frontend: Pass DRM format info to input format helpers Paul Kocialkowski
     [not found]     ` <20181205083703.21488-5-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
2018-12-05 15:35       ` Maxime Ripard
2018-12-05  8:36   ` [PATCH v4 05/22] drm/sun4i: frontend: Determine input format based on colorspace Paul Kocialkowski
     [not found]     ` <20181205083703.21488-6-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
2018-12-05 15:39       ` Maxime Ripard
2018-12-05  8:36   ` [PATCH v4 06/22] drm/sun4i: Move the BT.601 CSC coefficients to the frontend Paul Kocialkowski
     [not found]     ` <20181205083703.21488-7-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
2018-12-05 15:38       ` Maxime Ripard
2018-12-05  8:36   ` [PATCH v4 07/22] drm/sun4i: frontend: Configure and enable YUV to RGB CSC when needed Paul Kocialkowski
     [not found]     ` <20181205083703.21488-8-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
2018-12-05 15:38       ` Maxime Ripard
2018-12-05  8:36   ` [PATCH v4 08/22] drm/sun4i: frontend: Add support for packed YUV422 input formats Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 09/22] drm/sun4i: frontend: Add support for semi-planar YUV " Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 11/22] drm/fourcc: Add definitions for Allwinner vendor and VPU tiled format Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 12/22] drm/sun4i: frontend: Add support for tiled YUV input mode configuration Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 13/22] drm/sun4i: Add buffer stride and offset configuration for tiling mode Paul Kocialkowski
2018-12-05 15:44     ` Maxime Ripard
2018-12-05  8:36   ` [PATCH v4 14/22] drm/sun4i: frontend: Add and use helper for checking tiling support Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 15/22] drm/sun4i: layer: Add tiled modifier support and helper Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 16/22] drm/sun4i: drv: Allow framebuffer modifiers in mode config Paul Kocialkowski
2018-12-05  8:36   ` [PATCH v4 17/22] drm/sun4i: Move access control before setting the register as documented Paul Kocialkowski
2018-12-05  8:36   ` Paul Kocialkowski [this message]
2018-12-05  8:37   ` [PATCH v4 19/22] drm/sun4i: Set the coef_rdy bit right after the coef have been set Paul Kocialkowski
2018-12-05  8:37   ` [PATCH v4 20/22] drm/sun4i: Make COEF_RDY conditional Paul Kocialkowski
2018-12-05  8:37   ` [PATCH v4 21/22] drm/sun4i: frontend: Move the FIR filter phases to our quirks Paul Kocialkowski
2018-12-05  8:37   ` [PATCH v4 22/22] drm/sun4i: frontend: Add A20-specific device-tree compatible and quirks Paul Kocialkowski
2019-01-03 10:10   ` [PATCH v4 00/22] drm/sun4i: Support for linear and tiled YUV formats with the frontend Paul Kocialkowski

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=20181205083703.21488-19-paul.kocialkowski@bootlin.com \
    --to=paul.kocialkowski-ldxbnhwyfcjbdgjk7y7tuq@public.gmane.org \
    --cc=airlied-cv59FeDIM0c@public.gmane.org \
    --cc=daniel-/w4YWyX8dFk@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org \
    --cc=sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org \
    --cc=thomas.petazzoni-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org \
    --cc=wens-jdAy2FN1RRM@public.gmane.org \
    /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