From: Archit Taneja <archit@ti.com>
To: tomi.valkeinen@ti.com
Cc: linux-omap@vger.kernel.org, Archit Taneja <archit@ti.com>
Subject: [PATCH v2 5/7] OMAP: DSS2: DSI: Pass pointer to struct to packet_sent_handler isrs
Date: Thu, 12 May 2011 17:26:28 +0530 [thread overview]
Message-ID: <1305201390-9724-6-git-send-email-archit@ti.com> (raw)
In-Reply-To: <1305201390-9724-1-git-send-email-archit@ti.com>
dsi_packet_sent_handler_vp() and dsi_packet_sent_handler_l4() currently
receive the completion parameter as their argument. This is not sufficient
information to differentiate between DSI1 and DSI2 platform devices.
Pass the struct "dsi_packet_sent_handler_data" to the packet_sent_handler
isrs, these contain the platform_device pointer of the DSI device and the
pointer to the completion struct.
Signed-off-by: Archit Taneja <archit@ti.com>
---
drivers/video/omap2/dss/dsi.c | 43 +++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 61ee3db..762b0fe 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -330,6 +330,11 @@ struct dsi_data {
unsigned scp_clk_refcount;
};
+struct dsi_packet_sent_handler_data {
+ struct platform_device *dsidev;
+ struct completion *completion;
+};
+
static struct platform_device *dsi_pdev_map[MAX_NUM_DSI];
#ifdef DEBUG
@@ -2394,27 +2399,28 @@ static bool dsi_vc_is_enabled(struct platform_device *dsidev, int channel)
static void dsi_packet_sent_handler_vp(void *data, u32 mask)
{
- struct platform_device *dsidev = dsi_get_dsidev_from_id(0);
- struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+ struct dsi_packet_sent_handler_data *vp_data =
+ (struct dsi_packet_sent_handler_data *) data;
+ struct dsi_data *dsi = dsi_get_dsidrv_data(vp_data->dsidev);
const int channel = dsi->update_channel;
u8 bit = dsi->te_enabled ? 30 : 31;
- if (REG_GET(dsidev, DSI_VC_TE(channel), bit, bit) == 0)
- complete((struct completion *)data);
+ if (REG_GET(vp_data->dsidev, DSI_VC_TE(channel), bit, bit) == 0)
+ complete(vp_data->completion);
}
static int dsi_sync_vc_vp(struct platform_device *dsidev, int channel)
{
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+ DECLARE_COMPLETION_ONSTACK(completion);
+ struct dsi_packet_sent_handler_data vp_data = { dsidev, &completion };
int r = 0;
u8 bit;
- DECLARE_COMPLETION_ONSTACK(completion);
-
bit = dsi->te_enabled ? 30 : 31;
r = dsi_register_isr_vc(dsidev, channel, dsi_packet_sent_handler_vp,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &vp_data, DSI_VC_IRQ_PACKET_SENT);
if (r)
goto err0;
@@ -2429,34 +2435,35 @@ static int dsi_sync_vc_vp(struct platform_device *dsidev, int channel)
}
dsi_unregister_isr_vc(dsidev, channel, dsi_packet_sent_handler_vp,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &vp_data, DSI_VC_IRQ_PACKET_SENT);
return 0;
err1:
dsi_unregister_isr_vc(dsidev, channel, dsi_packet_sent_handler_vp,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &vp_data, DSI_VC_IRQ_PACKET_SENT);
err0:
return r;
}
static void dsi_packet_sent_handler_l4(void *data, u32 mask)
{
- struct platform_device *dsidev = dsi_get_dsidev_from_id(0);
- struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+ struct dsi_packet_sent_handler_data *l4_data =
+ (struct dsi_packet_sent_handler_data *) data;
+ struct dsi_data *dsi = dsi_get_dsidrv_data(l4_data->dsidev);
const int channel = dsi->update_channel;
- if (REG_GET(dsidev, DSI_VC_CTRL(channel), 5, 5) == 0)
- complete((struct completion *)data);
+ if (REG_GET(l4_data->dsidev, DSI_VC_CTRL(channel), 5, 5) == 0)
+ complete(l4_data->completion);
}
static int dsi_sync_vc_l4(struct platform_device *dsidev, int channel)
{
- int r = 0;
-
DECLARE_COMPLETION_ONSTACK(completion);
+ struct dsi_packet_sent_handler_data l4_data = { dsidev, &completion };
+ int r = 0;
r = dsi_register_isr_vc(dsidev, channel, dsi_packet_sent_handler_l4,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &l4_data, DSI_VC_IRQ_PACKET_SENT);
if (r)
goto err0;
@@ -2471,12 +2478,12 @@ static int dsi_sync_vc_l4(struct platform_device *dsidev, int channel)
}
dsi_unregister_isr_vc(dsidev, channel, dsi_packet_sent_handler_l4,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &l4_data, DSI_VC_IRQ_PACKET_SENT);
return 0;
err1:
dsi_unregister_isr_vc(dsidev, channel, dsi_packet_sent_handler_l4,
- &completion, DSI_VC_IRQ_PACKET_SENT);
+ &l4_data, DSI_VC_IRQ_PACKET_SENT);
err0:
return r;
}
--
1.7.1
next prev parent reply other threads:[~2011-05-12 11:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-12 11:56 [PATCH v2 0/7] OMAP: DSS2: DSI2 for secondary lcd panel on OMAP4 Archit Taneja
2011-05-12 11:56 ` [PATCH v2 1/7] OMAP: DSS2: DSI: Add extra omap_dss_device argument in functions exported by dsi Archit Taneja
2011-05-12 11:56 ` [PATCH v2 2/7] OMAP: DSS2: Remove omap_dss_device argument from dsi_pll_init() Archit Taneja
2011-05-12 11:56 ` [PATCH v2 3/7] OMAP: DSS2: Pass platform_device as an argument in dsi functions Archit Taneja
2011-05-12 11:56 ` [PATCH v2 4/7] OMAP: DSS2: DSI: Use platform_device pointer to get dsi data Archit Taneja
2011-05-12 11:56 ` Archit Taneja [this message]
2011-05-12 11:56 ` [PATCH v2 6/7] OMAP4: DSS2: DSI: Changes for DSI2 on OMAP4 Archit Taneja
2011-05-12 11:56 ` [PATCH v2 7/7] OMAP: DSS2: Taal: Use device name in backlight_device_register Archit Taneja
2011-05-13 5:51 ` [PATCH v2 0/7] OMAP: DSS2: DSI2 for secondary lcd panel on OMAP4 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=1305201390-9724-6-git-send-email-archit@ti.com \
--to=archit@ti.com \
--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 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).