All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: dri-devel@lists.freedesktop.org,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>, Jyri Sarha <jsarha@ti.com>
Subject: [PATCHv3 13/30] drm/omap: move dispc related dss-feat funcs to dispc
Date: Tue, 28 Mar 2017 16:07:59 +0300	[thread overview]
Message-ID: <1490706496-4959-14-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1490706496-4959-1-git-send-email-tomi.valkeinen@ti.com>

omapdrm still uses a few non-dispc functions: dss_feat_get_num_mgrs(),
dss_feat_get_num_ovls() and  dss_feat_get_supported_color_modes(). We
want to provide omapdrm a single dispc_ops function pointer struct so
that omapdrm will use either the current omapdss or the new omapdss6
driver depending on the platform.

Those three functions are really dispc functions, but are located in the
dss_features.c for legacy reasons.

This patch adds similar functionss to the dispc, and changes omapdrm to
use those new functions. Underneath the functions still call the
functions from dss_feature.c.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/gpu/drm/omapdrm/dss/dispc.c        | 18 ++++++++++++++++++
 drivers/gpu/drm/omapdrm/dss/dss_features.c |  3 ---
 drivers/gpu/drm/omapdrm/dss/dss_features.h |  4 ++++
 drivers/gpu/drm/omapdrm/dss/omapdss.h      |  5 +++++
 drivers/gpu/drm/omapdrm/omap_drv.c         |  4 ++--
 drivers/gpu/drm/omapdrm/omap_irq.c         |  2 +-
 drivers/gpu/drm/omapdrm/omap_plane.c       |  2 +-
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index d956e6266368..53d08dc4ef5a 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -1135,6 +1135,18 @@ static u32 dispc_ovl_get_burst_size(enum omap_plane plane)
 	return unit * 8;
 }
 
+enum omap_color_mode dispc_ovl_get_color_modes(enum omap_plane plane)
+{
+	return dss_feat_get_supported_color_modes(plane);
+}
+EXPORT_SYMBOL(dispc_ovl_get_color_modes);
+
+int dispc_get_num_ovls(void)
+{
+	return dss_feat_get_num_ovls();
+}
+EXPORT_SYMBOL(dispc_get_num_ovls);
+
 static void dispc_mgr_enable_cpr(enum omap_channel channel, bool enable)
 {
 	if (channel == OMAP_DSS_CHANNEL_DIGIT)
@@ -2967,6 +2979,12 @@ void dispc_pck_free_enable(bool enable)
 	REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27);
 }
 
+int dispc_get_num_mgrs(void)
+{
+	return dss_feat_get_num_mgrs();
+}
+EXPORT_SYMBOL(dispc_get_num_mgrs);
+
 static void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable)
 {
 	mgr_fld_write(channel, DISPC_MGR_FLD_FIFOHANDCHECK, enable);
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
index ee5b93ce2763..26c29332b8e3 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.c
@@ -774,13 +774,11 @@ int dss_feat_get_num_mgrs(void)
 {
 	return omap_current_dss_features->num_mgrs;
 }
-EXPORT_SYMBOL(dss_feat_get_num_mgrs);
 
 int dss_feat_get_num_ovls(void)
 {
 	return omap_current_dss_features->num_ovls;
 }
-EXPORT_SYMBOL(dss_feat_get_num_ovls);
 
 unsigned long dss_feat_get_param_min(enum dss_range_param param)
 {
@@ -806,7 +804,6 @@ enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane)
 {
 	return omap_current_dss_features->supported_color_modes[plane];
 }
-EXPORT_SYMBOL(dss_feat_get_supported_color_modes);
 
 enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane)
 {
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
index bb4b7f0e642b..bcec68ba8db9 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h
@@ -104,4 +104,8 @@ void dss_features_init(enum omapdss_version version);
 enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel);
 enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel);
 
+int dss_feat_get_num_mgrs(void);
+int dss_feat_get_num_ovls(void);
+enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane);
+
 #endif
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index dab367ae5ca1..4d3999c18fa2 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -860,6 +860,9 @@ void dispc_free_irq(void *dev_id);
 int dispc_runtime_get(void);
 void dispc_runtime_put(void);
 
+int dispc_get_num_ovls(void);
+int dispc_get_num_mgrs(void);
+
 void dispc_mgr_enable(enum omap_channel channel, bool enable);
 u32 dispc_mgr_get_vsync_irq(enum omap_channel channel);
 u32 dispc_mgr_get_framedone_irq(enum omap_channel channel);
@@ -872,6 +875,7 @@ void dispc_mgr_set_timings(enum omap_channel channel,
 		const struct videomode *vm);
 void dispc_mgr_setup(enum omap_channel channel,
 		const struct omap_overlay_manager_info *info);
+enum omap_dss_output_id dispc_mgr_get_supported_outputs(enum omap_channel channel);
 u32 dispc_mgr_gamma_size(enum omap_channel channel);
 void dispc_mgr_set_gamma(enum omap_channel channel,
 			 const struct drm_color_lut *lut,
@@ -883,6 +887,7 @@ void dispc_ovl_set_channel_out(enum omap_plane plane,
 		enum omap_channel channel);
 int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
 		bool replication, const struct videomode *vm, bool mem_to_mem);
+enum omap_color_mode dispc_ovl_get_color_modes(enum omap_plane plane);
 
 enum omap_dss_output_id dispc_mgr_get_supported_outputs(enum omap_channel channel);
 
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index ce0a1c04403d..db0b485ef6c2 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -320,8 +320,8 @@ static int omap_modeset_init(struct drm_device *dev)
 {
 	struct omap_drm_private *priv = dev->dev_private;
 	struct omap_dss_device *dssdev = NULL;
-	int num_ovls = dss_feat_get_num_ovls();
-	int num_mgrs = dss_feat_get_num_mgrs();
+	int num_ovls = dispc_get_num_ovls();
+	int num_mgrs = dispc_get_num_mgrs();
 	int num_crtcs;
 	int i, id = 0;
 	int ret;
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
index 59f21add6f19..a3fd6e8266c8 100644
--- a/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -249,7 +249,7 @@ static const u32 omap_underflow_irqs[] = {
 int omap_drm_irq_install(struct drm_device *dev)
 {
 	struct omap_drm_private *priv = dev->dev_private;
-	unsigned int num_mgrs = dss_feat_get_num_mgrs();
+	unsigned int num_mgrs = dispc_get_num_mgrs();
 	unsigned int max_planes;
 	unsigned int i;
 	int ret;
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 386d90af70f7..1067695af401 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -352,7 +352,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
 
 	omap_plane->nformats = omap_framebuffer_get_formats(
 			omap_plane->formats, ARRAY_SIZE(omap_plane->formats),
-			dss_feat_get_supported_color_modes(id));
+			dispc_ovl_get_color_modes(id));
 	omap_plane->id = id;
 	omap_plane->name = plane_names[id];
 
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2017-03-28 13:08 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-28 13:07 [PATCHv3 00/30] drm/omap: miscallaneous improvements Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 01/30] drm/omap: work-around for errata i886 Tomi Valkeinen
2017-03-29  8:00   ` Laurent Pinchart
2017-03-28 13:07 ` [PATCHv3 02/30] drm/omap: refactor CRTC HW property setup Tomi Valkeinen
2017-03-29  8:05   ` Laurent Pinchart
2017-03-29  8:12     ` Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 03/30] drm/omap: remove divider constraint from hsdiv Tomi Valkeinen
2017-03-29  8:09   ` Laurent Pinchart
2017-03-28 13:07 ` [PATCHv3 04/30] drm/omap: decrease min width & height Tomi Valkeinen
2017-03-29  8:13   ` Laurent Pinchart
2017-03-29  8:23     ` Tomi Valkeinen
2017-03-29  8:24       ` Laurent Pinchart
2017-03-29  8:26         ` Tomi Valkeinen
2017-03-29  8:30           ` Laurent Pinchart
2017-03-29  8:43             ` Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 05/30] drm/omap: improve DPI clock selection on DRA7xx Tomi Valkeinen
2017-03-29  8:19   ` Laurent Pinchart
2017-03-29  8:36     ` Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 06/30] drm/omap: Add support for render nodes Tomi Valkeinen
2017-03-29  8:22   ` Laurent Pinchart
2017-03-29  8:58     ` Tomi Valkeinen
2017-03-29 12:20       ` Laurent Pinchart
2017-03-29 12:51         ` David Herrmann
2017-03-29 21:42           ` Laurent Pinchart
2017-03-30  6:44             ` David Herrmann
2017-03-30  7:43               ` Daniel Vetter
2017-03-28 13:07 ` [PATCHv3 07/30] drm/omap: fix HDMI sync polarities Tomi Valkeinen
2017-03-29  8:26   ` Laurent Pinchart
2017-03-28 13:07 ` [PATCHv3 08/30] drm/omap: add omapdss-base.ko Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 09/30] drm/omap: move dss_initialized to omapdss-base Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 10/30] drm/omap: output: use dev_err instead of DSSERR Tomi Valkeinen
2017-03-29  8:32   ` Laurent Pinchart
2017-03-28 13:07 ` [PATCHv3 11/30] drm/omap: display: don't use dsi_get_pixel_size() Tomi Valkeinen
2017-03-28 13:07 ` [PATCHv3 12/30] drm/omap: move display, dss-of, output to omapdss-base Tomi Valkeinen
2017-03-28 13:07 ` Tomi Valkeinen [this message]
2017-03-28 13:08 ` [PATCHv3 14/30] drm/omap: add dispc_ops Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 15/30] drm/omap: fill dispc_ops Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 16/30] drm/omap: use dispc_ops Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 17/30] drm/omap: remove all EXPORT_SYMBOLs from dispc.c Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 18/30] drm/omap: remove unused dispc_wb_enable & dispc_wb_is_enabled Tomi Valkeinen
2017-03-29 11:46   ` Laurent Pinchart
2017-03-28 13:08 ` [PATCHv3 19/30] drm/omap: fix replication logic Tomi Valkeinen
2017-03-29 11:45   ` Laurent Pinchart
2017-03-28 13:08 ` [PATCHv3 20/30] drm/omap: dss: Functions to check components in the display/output list Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 21/30] drm/omap: dss: Support for detecting display stack readiness Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 22/30] drm/omap: Use omapdss_stack_is_ready() to check that the display stack is up Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 23/30] drm/omap: fix plane update warning when crtc is disabled Tomi Valkeinen
2017-03-29 10:30   ` Laurent Pinchart
2017-03-30 10:28     ` Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 24/30] drm/omap: display: Add displays in sorted order to the panel_list Tomi Valkeinen
2017-03-29 10:08   ` Laurent Pinchart
2017-03-30 10:58     ` Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 25/30] drm/omap: poll only connectors where the connect/disconnect can be checked Tomi Valkeinen
2017-03-29  9:26   ` Laurent Pinchart
2017-03-28 13:08 ` [PATCHv3 26/30] drm/omap: displays: panel-dpi: Support for handling backlight devices Tomi Valkeinen
2017-03-29  9:13   ` Laurent Pinchart
2017-03-28 13:08 ` [PATCHv3 27/30] drm/omap: dispc: improve debug print of display flags Tomi Valkeinen
2017-03-29  9:00   ` Laurent Pinchart
2017-03-29 10:27     ` Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 28/30] drm/omap: fix display SYNC/DE flags Tomi Valkeinen
2017-03-29  8:58   ` Laurent Pinchart
2017-03-29 10:09     ` Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 29/30] drm/omap: use drm_atomic_helper_shutdown() Tomi Valkeinen
2017-03-29  8:49   ` Laurent Pinchart
2017-03-29  9:08     ` Tomi Valkeinen
2017-03-29  9:11       ` Laurent Pinchart
2017-03-29  9:22         ` Tomi Valkeinen
2017-03-28 13:08 ` [PATCHv3 30/30] drm/omap: fix crash on module unload Tomi Valkeinen
2017-03-29  8:38   ` Laurent Pinchart
2017-03-29 12:09 ` [PATCHv3 00/30] drm/omap: miscallaneous improvements Laurent Pinchart
2017-03-29 14:19   ` Tomi Valkeinen

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=1490706496-4959-14-git-send-email-tomi.valkeinen@ti.com \
    --to=tomi.valkeinen@ti.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jsarha@ti.com \
    --cc=laurent.pinchart@ideasonboard.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.