From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>, linux-omap@vger.kernel.org
Subject: [PATCH/RFC 3/7] drm: omapdrm: Retrieve OMAP revision from omapdss
Date: Wed, 14 Dec 2016 01:38:22 +0200 [thread overview]
Message-ID: <1481672306-22564-4-git-send-email-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <1481672306-22564-1-git-send-email-laurent.pinchart@ideasonboard.com>
The OMAP revision is currently passed through omapdrm platform data. To
prepare for removal of omapdrm platform data, get it from the omapdss.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/gpu/drm/omapdrm/dss/core.c | 8 ++++++++
drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 +
drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 6a3ebfcd7223..1bf978b5c5bc 100644
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -62,6 +62,14 @@ enum omapdss_version omapdss_get_version(void)
}
EXPORT_SYMBOL(omapdss_get_version);
+u32 omapdss_get_omaprev(void)
+{
+ struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
+
+ return pdata->omaprev;
+}
+EXPORT_SYMBOL(omapdss_get_omaprev);
+
struct platform_device *dss_get_core_pdev(void)
{
return core.pdev;
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index b420dde8c0fb..6c2553b56971 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -767,6 +767,7 @@ struct omap_dss_driver {
};
enum omapdss_version omapdss_get_version(void);
+u32 omapdss_get_omaprev(void);
bool omapdss_is_initialized(void);
int omap_dss_register_driver(struct omap_dss_driver *);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index a3b37823b271..0e54e3c9c291 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -743,7 +743,6 @@ static struct drm_driver omap_drm_driver = {
static int pdev_probe(struct platform_device *pdev)
{
- struct omap_drm_platform_data *pdata = pdev->dev.platform_data;
struct omap_drm_private *priv;
struct drm_device *ddev;
unsigned int i;
@@ -769,7 +768,7 @@ static int pdev_probe(struct platform_device *pdev)
goto err_disconnect_dssdevs;
}
- priv->omaprev = pdata->omaprev;
+ priv->omaprev = omapdss_get_omaprev();
priv->wq = alloc_ordered_workqueue("omapdrm", 0);
init_waitqueue_head(&priv->commit.wait);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index b20377efd01b..2c9ddcec1449 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -21,7 +21,6 @@
#define __OMAP_DRV_H__
#include <linux/module.h>
-#include <linux/platform_data/omap_drm.h>
#include <linux/types.h>
#include <linux/wait.h>
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-12-13 23:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-13 23:38 [PATCH/RFC 0/7] Remove the omapdrm device from platform code Laurent Pinchart
2016-12-13 23:38 ` [PATCH/RFC 1/7] drm: omapdrm: Add OMAP revision to omapdss platform data Laurent Pinchart
2016-12-13 23:38 ` [PATCH/RFC 2/7] ARM: OMAP2+: Populate the omapdss platform data OMAP revision Laurent Pinchart
2016-12-13 23:38 ` Laurent Pinchart [this message]
2016-12-13 23:38 ` [PATCH/RFC 4/7] ARM: OMAP2+: Remove omapdrm platform data Laurent Pinchart
2016-12-13 23:38 ` [PATCH/RFC 5/7] drm: omapdrm: " Laurent Pinchart
2016-12-13 23:38 ` [PATCH/RFC 6/7] drm: omapdrm: Register omapdrm platform device in omapdss driver Laurent Pinchart
2016-12-14 8:20 ` Tomi Valkeinen
2016-12-14 11:54 ` Laurent Pinchart
2016-12-13 23:38 ` [PATCH/RFC 7/7] ARM: OMAP2+: Remove unused omapdrm platform device Laurent Pinchart
2016-12-14 1:58 ` [PATCH/RFC 8/7] drm: omapdrm: Handle DSI pin muxing internally Laurent Pinchart
2016-12-14 1:58 ` [PATCH/RFC 9/7] drm: omapdrm: Don't forward set_min_bus_tput() to no-op platform code Laurent Pinchart
2016-12-14 1:58 ` [PATCH/RFC 10/7] ARM: OMAP2+: Remove DSI pin muxing Laurent Pinchart
2016-12-14 1:58 ` [PATCH/RFC 11/7] ARM: OMAP2+: Remove omapdss set_min_bus_tput platform data callback Laurent Pinchart
2016-12-14 1:58 ` [PATCH/RFC 12/7] drm: omapdrm: Remove unused omapdss platform data fields Laurent Pinchart
2016-12-18 0:54 ` [PATCH/RFC v1.1 12/7] drm: omapdrm: Remove unused omapdss platform data field Laurent Pinchart
2016-12-14 15:05 ` [PATCH/RFC 0/7] Remove the omapdrm device from platform code Tony Lindgren
2016-12-15 8:08 ` Tomi Valkeinen
2016-12-15 10:07 ` Laurent Pinchart
2016-12-15 11:04 ` 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=1481672306-22564-4-git-send-email-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@ti.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.