From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org, sumit.semwal@ti.com, rob@ti.com, Archit Taneja <archit@ti.com> Subject: [RFC 16/17] OMAPDSS: VENC: Maintain our own timings field in driver data Date: Wed, 01 Aug 2012 10:43:27 +0000 [thread overview] Message-ID: <1343817088-29645-17-git-send-email-archit@ti.com> (raw) In-Reply-To: <1343817088-29645-1-git-send-email-archit@ti.com> The VENC driver currently relies on the timings in omap_dss_device struct to configure the DISPC and VENC blocks accordingly. This makes the VENC interface driver dependent on the omap_dss_device struct. Make the VENC driver data maintain it's own timings field. The panel driver is expected to call omapdss_venc_set_timings() to set these timings before the panel is enabled. Make the VENC panel driver configure the new timings is the omap_dss_device struct(dssdev->panel.timings). The VENC driver is responsible for maintaining only it's own copy of timings. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/venc.c | 12 +++++++----- drivers/video/omap2/dss/venc_panel.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index ffca542..d96025e 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -300,6 +300,8 @@ static struct { struct regulator *vdda_dac_reg; struct clk *tv_dac_clk; + + struct omap_video_timings timings; } venc; static inline void venc_write_reg(int idx, u32 val) @@ -432,7 +434,7 @@ static int venc_power_on(struct omap_dss_device *dssdev) goto err0; venc_reset(); - venc_write_config(venc_timings_to_config(&dssdev->panel.timings)); + venc_write_config(venc_timings_to_config(&venc.timings)); dss_set_venc_output(dssdev->phy.venc.type); dss_set_dac_pwrdn_bgz(1); @@ -449,7 +451,7 @@ static int venc_power_on(struct omap_dss_device *dssdev) venc_write_reg(VENC_OUTPUT_CONTROL, l); - dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings); + dss_mgr_set_timings(dssdev->manager, &venc.timings); r = regulator_enable(venc.vdda_dac_reg); if (r) @@ -556,10 +558,10 @@ void omapdss_venc_set_timings(struct omap_dss_device *dssdev, mutex_lock(&venc.venc_lock); /* Reset WSS data when the TV standard changes. */ - if (memcmp(&dssdev->panel.timings, timings, sizeof(*timings))) + if (memcmp(&venc.timings, timings, sizeof(*timings))) venc.wss_data = 0; - dssdev->panel.timings = *timings; + venc.timings = *timings; if (dssdev->state = OMAP_DSS_DISPLAY_ACTIVE) { int r; @@ -606,7 +608,7 @@ int omapdss_venc_set_wss(struct omap_dss_device *dssdev, u32 wss) mutex_lock(&venc.venc_lock); - config = venc_timings_to_config(&dssdev->panel.timings); + config = venc_timings_to_config(&venc.timings); /* Invert due to VENC_L21_WC_CTL:INV=1 */ venc.wss_data = (wss ^ 0xfffff) << 8; diff --git a/drivers/video/omap2/dss/venc_panel.c b/drivers/video/omap2/dss/venc_panel.c index 6b31298..350b0d9 100644 --- a/drivers/video/omap2/dss/venc_panel.c +++ b/drivers/video/omap2/dss/venc_panel.c @@ -170,6 +170,7 @@ static void venc_panel_set_timings(struct omap_dss_device *dssdev, mutex_lock(&venc_panel.lock); omapdss_venc_set_timings(dssdev, timings); + dssdev->panel.timings = *timings; mutex_unlock(&venc_panel.lock); } -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org, sumit.semwal@ti.com, rob@ti.com, Archit Taneja <archit@ti.com> Subject: [RFC 16/17] OMAPDSS: VENC: Maintain our own timings field in driver data Date: Wed, 1 Aug 2012 16:01:27 +0530 [thread overview] Message-ID: <1343817088-29645-17-git-send-email-archit@ti.com> (raw) In-Reply-To: <1343817088-29645-1-git-send-email-archit@ti.com> The VENC driver currently relies on the timings in omap_dss_device struct to configure the DISPC and VENC blocks accordingly. This makes the VENC interface driver dependent on the omap_dss_device struct. Make the VENC driver data maintain it's own timings field. The panel driver is expected to call omapdss_venc_set_timings() to set these timings before the panel is enabled. Make the VENC panel driver configure the new timings is the omap_dss_device struct(dssdev->panel.timings). The VENC driver is responsible for maintaining only it's own copy of timings. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/venc.c | 12 +++++++----- drivers/video/omap2/dss/venc_panel.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index ffca542..d96025e 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -300,6 +300,8 @@ static struct { struct regulator *vdda_dac_reg; struct clk *tv_dac_clk; + + struct omap_video_timings timings; } venc; static inline void venc_write_reg(int idx, u32 val) @@ -432,7 +434,7 @@ static int venc_power_on(struct omap_dss_device *dssdev) goto err0; venc_reset(); - venc_write_config(venc_timings_to_config(&dssdev->panel.timings)); + venc_write_config(venc_timings_to_config(&venc.timings)); dss_set_venc_output(dssdev->phy.venc.type); dss_set_dac_pwrdn_bgz(1); @@ -449,7 +451,7 @@ static int venc_power_on(struct omap_dss_device *dssdev) venc_write_reg(VENC_OUTPUT_CONTROL, l); - dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings); + dss_mgr_set_timings(dssdev->manager, &venc.timings); r = regulator_enable(venc.vdda_dac_reg); if (r) @@ -556,10 +558,10 @@ void omapdss_venc_set_timings(struct omap_dss_device *dssdev, mutex_lock(&venc.venc_lock); /* Reset WSS data when the TV standard changes. */ - if (memcmp(&dssdev->panel.timings, timings, sizeof(*timings))) + if (memcmp(&venc.timings, timings, sizeof(*timings))) venc.wss_data = 0; - dssdev->panel.timings = *timings; + venc.timings = *timings; if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { int r; @@ -606,7 +608,7 @@ int omapdss_venc_set_wss(struct omap_dss_device *dssdev, u32 wss) mutex_lock(&venc.venc_lock); - config = venc_timings_to_config(&dssdev->panel.timings); + config = venc_timings_to_config(&venc.timings); /* Invert due to VENC_L21_WC_CTL:INV=1 */ venc.wss_data = (wss ^ 0xfffff) << 8; diff --git a/drivers/video/omap2/dss/venc_panel.c b/drivers/video/omap2/dss/venc_panel.c index 6b31298..350b0d9 100644 --- a/drivers/video/omap2/dss/venc_panel.c +++ b/drivers/video/omap2/dss/venc_panel.c @@ -170,6 +170,7 @@ static void venc_panel_set_timings(struct omap_dss_device *dssdev, mutex_lock(&venc_panel.lock); omapdss_venc_set_timings(dssdev, timings); + dssdev->panel.timings = *timings; mutex_unlock(&venc_panel.lock); } -- 1.7.9.5
next prev parent reply other threads:[~2012-08-01 10:43 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-01 10:31 [RFC 00/17] OMAPDSS: Change way of passing timings from panel driver to interface Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 01/17] OMAPDSS: APPLY: Constify timings argument in dss_mgr_set_timings Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 02/17] OMAPDSS: DPI: Remove omap_dss_device arguments in dpi_set_dsi_clk/dpi_set_dispc_clk Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 03/17] OMAPDSS: HDMI: Remove omap_dss_device argument from hdmi_compute_pll Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 04/17] OMAPDSS: DPI: Add locking for DPI interface Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 05/17] OMAPDSS: DPI: Maintain our own timings field in driver data Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 06/17] OMAPDSS: DPI displays: Take care of panel timings in the driver itself Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 07/17] OMAPDSS: Displays: Add locking in generic DPI panel driver Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 08/17] OMAPDSS: DSI: Maintain own copy of timings in driver data Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-07 14:07 ` Tomi Valkeinen 2012-08-07 14:07 ` Tomi Valkeinen 2012-08-08 5:57 ` Archit Taneja 2012-08-08 6:09 ` Archit Taneja 2012-08-08 6:15 ` Tomi Valkeinen 2012-08-08 6:15 ` Tomi Valkeinen 2012-08-08 6:29 ` Archit Taneja 2012-08-08 6:41 ` Archit Taneja 2012-08-08 7:10 ` Tomi Valkeinen 2012-08-08 7:10 ` Tomi Valkeinen 2012-08-08 7:54 ` Archit Taneja 2012-08-08 8:06 ` Archit Taneja 2012-08-01 10:31 ` [RFC 09/17] OMAPDSS: HDMI: Use our own omap_video_timings field when setting interface timings Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 10/17] OMAPDSS: HDMI: Add a get_timing function for HDMI interface Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 11/17] OMAPDSS: HDMI: Add locking for hdmi interface get/set timing functions Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 12/17] OMAPDSS: SDI: Create a separate function for timing/clock configurations Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 13/17] OMAPDSS: SDI: Create a function to set timings Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-07 14:20 ` Tomi Valkeinen 2012-08-07 14:20 ` Tomi Valkeinen 2012-08-08 5:58 ` Archit Taneja 2012-08-08 6:10 ` Archit Taneja 2012-08-01 10:31 ` [RFC 14/17] OMAPDSS: SDI: Maintain our own timings field in driver data Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` [RFC 15/17] OMAPDSS: VENC: Split VENC into interface and panel driver Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:31 ` Archit Taneja [this message] 2012-08-01 10:43 ` [RFC 16/17] OMAPDSS: VENC: Maintain our own timings field in driver data Archit Taneja 2012-08-01 10:31 ` [RFC 17/17] OMAPDSS: VENC: Add a get_timing function for VENC interface Archit Taneja 2012-08-01 10:43 ` Archit Taneja 2012-08-01 10:35 ` [RFC 00/17] OMAPDSS: Change way of passing timings from panel driver to interface Archit Taneja 2012-08-01 10:47 ` Archit Taneja 2012-08-07 14:32 ` Tomi Valkeinen 2012-08-07 14:32 ` Tomi Valkeinen 2012-08-08 6:05 ` Archit Taneja 2012-08-08 6:17 ` Archit Taneja 2012-08-08 6:25 ` Tomi Valkeinen 2012-08-08 6:25 ` Tomi Valkeinen 2012-08-08 6:47 ` Archit Taneja 2012-08-08 6:59 ` Archit Taneja 2012-08-08 7:27 ` Tomi Valkeinen 2012-08-08 7:27 ` Tomi Valkeinen 2012-08-08 7:59 ` Archit Taneja 2012-08-08 8:11 ` Archit Taneja 2012-08-08 8:13 ` Tomi Valkeinen 2012-08-08 8:13 ` Tomi Valkeinen 2012-08-08 8:38 ` Archit Taneja 2012-08-08 8:50 ` Archit Taneja 2012-08-08 8:48 ` Tomi Valkeinen 2012-08-08 8:48 ` Tomi Valkeinen 2012-08-08 9:24 ` Archit Taneja 2012-08-08 9:36 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 00/13] " Archit Taneja 2012-08-09 11:55 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 01/13] OMAPDSS: DPI: Maintain our own timings field in driver data Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 02/13] OMAPDSS: DPI displays: Take care of panel timings in the driver itself Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 03/13] OMAPDSS: DSI: Maintain own copy of timings in driver data Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 04/13] OMAPDSS: DSI: Add function to set panel size for command mode panels Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 05/13] OMAPDSS: DSI: Update manager timings on a manual update Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 06/13] OMAPDSS: HDMI: Use our own omap_video_timings field when setting interface timings Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 07/13] OMAPDSS: HDMI: Add a get_timing function for HDMI interface Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-14 13:02 ` Tomi Valkeinen 2012-08-14 13:02 ` Tomi Valkeinen 2012-08-14 13:15 ` Archit Taneja 2012-08-14 13:27 ` Archit Taneja 2012-08-14 14:10 ` Tomi Valkeinen 2012-08-14 14:10 ` Tomi Valkeinen 2012-08-14 17:16 ` Archit Taneja 2012-08-14 17:28 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 08/13] OMAPDSS: HDMI: Add locking for hdmi interface get/set timing functions Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 09/13] OMAPDSS: SDI: Create a function to set timings Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-14 13:44 ` Tomi Valkeinen 2012-08-14 13:44 ` Tomi Valkeinen 2012-08-14 16:56 ` Archit Taneja 2012-08-14 17:08 ` Archit Taneja 2012-08-14 17:33 ` Tomi Valkeinen 2012-08-14 17:33 ` Tomi Valkeinen 2012-08-14 19:08 ` Archit Taneja 2012-08-14 19:20 ` Archit Taneja 2012-08-15 6:43 ` Tomi Valkeinen 2012-08-15 6:43 ` Tomi Valkeinen 2012-08-14 19:26 ` Rob Clark 2012-08-14 19:26 ` Rob Clark 2012-08-09 11:49 ` [PATCH v2 10/13] OMAPDSS: SDI: Maintain our own timings field in driver data Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 11/13] OMAPDSS: VENC: Split VENC into interface and panel driver Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 12/13] OMAPDSS: VENC: Maintain our own timings field in driver data Archit Taneja 2012-08-09 11:56 ` Archit Taneja 2012-08-09 11:49 ` [PATCH v2 13/13] OMAPDSS: VENC: Add a get_timing function for VENC interface Archit Taneja 2012-08-09 11:56 ` Archit Taneja
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=1343817088-29645-17-git-send-email-archit@ti.com \ --to=archit@ti.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=rob@ti.com \ --cc=sumit.semwal@ti.com \ --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: linkBe 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.