Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1203300
| From | Russell King <rmk+kernel@arm.linux.org.uk> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 03/12] gpu: imx: simplify sync polarity setting |
| Date | 2015-08-08 18:10 +0200 |
| Message-ID | <pVeR4-3EB-19@gated-at.bofh.it> (permalink) |
| References | <pVeR3-3EB-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Use a function to convert the sync pin to a bit mask for the DI_GENERAL
register, and move this out of the interlace/non-interlace path to the
common path.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/gpu/ipu-v3/ipu-di.c | 50 +++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/ipu-v3/ipu-di.c b/drivers/gpu/ipu-v3/ipu-di.c
index 2970c6bb668c..a96991c5c15f 100644
--- a/drivers/gpu/ipu-v3/ipu-di.c
+++ b/drivers/gpu/ipu-v3/ipu-di.c
@@ -543,6 +543,29 @@ int ipu_di_adjust_videomode(struct ipu_di *di, struct videomode *mode)
}
EXPORT_SYMBOL_GPL(ipu_di_adjust_videomode);
+static u32 ipu_di_gen_polarity(int pin)
+{
+ switch (pin) {
+ case 1:
+ return DI_GEN_POLARITY_1;
+ case 2:
+ return DI_GEN_POLARITY_2;
+ case 3:
+ return DI_GEN_POLARITY_3;
+ case 4:
+ return DI_GEN_POLARITY_4;
+ case 5:
+ return DI_GEN_POLARITY_5;
+ case 6:
+ return DI_GEN_POLARITY_6;
+ case 7:
+ return DI_GEN_POLARITY_7;
+ case 8:
+ return DI_GEN_POLARITY_8;
+ }
+ return 0;
+}
+
int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
{
u32 reg;
@@ -586,11 +609,6 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
di_gen |= DI_GEN_POLARITY_8;
vsync_cnt = 7;
-
- if (sig->mode.flags & DISPLAY_FLAGS_HSYNC_HIGH)
- di_gen |= DI_GEN_POLARITY_3;
- if (sig->mode.flags & DISPLAY_FLAGS_VSYNC_HIGH)
- di_gen |= DI_GEN_POLARITY_2;
} else {
ipu_di_sync_config_noninterlaced(di, sig, div);
@@ -602,25 +620,13 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
*/
if (!(sig->hsync_pin == 2 && sig->vsync_pin == 3))
vsync_cnt = 6;
-
- if (sig->mode.flags & DISPLAY_FLAGS_HSYNC_HIGH) {
- if (sig->hsync_pin == 2)
- di_gen |= DI_GEN_POLARITY_2;
- else if (sig->hsync_pin == 4)
- di_gen |= DI_GEN_POLARITY_4;
- else if (sig->hsync_pin == 7)
- di_gen |= DI_GEN_POLARITY_7;
- }
- if (sig->mode.flags & DISPLAY_FLAGS_VSYNC_HIGH) {
- if (sig->vsync_pin == 3)
- di_gen |= DI_GEN_POLARITY_3;
- else if (sig->vsync_pin == 6)
- di_gen |= DI_GEN_POLARITY_6;
- else if (sig->vsync_pin == 8)
- di_gen |= DI_GEN_POLARITY_8;
- }
}
+ if (sig->mode.flags & DISPLAY_FLAGS_HSYNC_HIGH)
+ di_gen |= ipu_di_gen_polarity(sig->hsync_pin);
+ if (sig->mode.flags & DISPLAY_FLAGS_VSYNC_HIGH)
+ di_gen |= ipu_di_gen_polarity(sig->vsync_pin);
+
if (sig->clk_pol)
di_gen |= DI_GEN_POLARITY_DISP_CLK;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/12] dw-hdmi development Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 05/12] drm: bridge/dw_hdmi: add support for interlaced video modes Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 12/12] drm: bridge/dw_hdmi: improve HDMI enable/disable handling Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
Re: [PATCH 0/9] dw-hdmi audio support Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 2/9] drm: bridge/dw_hdmi-ahb-audio: parse ELD from HDMI driver Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 6/9] drm: bridge/dw_hdmi: adjust pixel clock values in N calculation Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 5/9] drm: bridge/dw_hdmi: avoid being recursive in N calculation Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 4/9] drm: bridge/dw_hdmi-ahb-audio: allow larger buffer sizes Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 8/9] drm: bridge/dw_hdmi: replace CTS calculation for the ACR Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 7/9] drm: bridge/dw_hdmi: remove ratio support from ACR code Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 9/9] drm: bridge/dw_hdmi-i2s-audio: add audio driver Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
Re: [PATCH 9/9] drm: bridge/dw_hdmi-i2s-audio: add audio driver Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-10 17:50 +0200
Re: [PATCH 9/9] drm: bridge/dw_hdmi-i2s-audio: add audio driver Yakir Yang <ykk@rock-chips.com> - 2015-08-10 18:30 +0200
[PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
Re: [PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Takashi Iwai <tiwai@suse.de> - 2015-08-10 12:10 +0200
Re: [PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-10 12:40 +0200
Re: [PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Takashi Iwai <tiwai@suse.de> - 2015-08-10 14:30 +0200
Re: [PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-10 19:00 +0200
Re: [PATCH 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Mark Brown <broonie@kernel.org> - 2015-08-10 20:20 +0200
Re: [PATCH v2 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver David Airlie <airlied@linux.ie>, Sascha Hauer <s.hauer@pengutronix.de>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela <perex@perex.cz>, linux-rockchip@lists.infradead.org, Mark Brown <broonie@kernel.org>, Philipp Zabel <p.zabel@pengutronix.de>, Yakir Yang <ykk@rock-chips.com>, Andy Yan <andy.yan@rock-chips.com>, Jon Nettleton <jon.nettleton@gmail.com>, linux-arm-kernel@lists.infradead.org Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-14 16:00 +0200
Re: [PATCH v2 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-14 16:10 +0200
Re: [alsa-devel] [PATCH v2 1/9] drm: bridge/dw_hdmi-ahb-audio: add audio driver Takashi Iwai <tiwai@suse.de> - 2015-08-14 16:40 +0200
[PATCH 3/9] drm: bridge/dw_hdmi-ahb-audio: basic support for multi-channel PCM audio Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
[PATCH 08/12] drm: bridge/dw_hdmi: avoid enabling interface in mode_set Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 04/12] gpu: imx: fix support for interlaced modes Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 09/12] drm: bridge/dw_hdmi: rename dw_hdmi_phy_enable_power() Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 03/12] gpu: imx: simplify sync polarity setting Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 01/12] drm: bridge/dw_hdmi: remove pixel repetition setting for all VICs Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 02/12] drm: bridge/dw_hdmi: don't support any pixel doubled modes Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 06/12] drm: bridge/dw_hdmi: clean up HDMI vs DVI mode handling Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 11/12] drm: bridge/dw_hdmi: add connector mode forcing Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:10 +0200
[PATCH 10/12] drm: bridge/dw_hdmi: fix phy enable/disable handling Russell King <rmk+kernel@arm.linux.org.uk> - 2015-08-08 18:20 +0200
Re: [PATCH 00/12] dw-hdmi development Thierry Reding <thierry.reding@gmail.com> - 2015-08-10 14:30 +0200
Re: [PATCH 00/12] dw-hdmi development Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-18 12:40 +0200
csiph-web