From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <thierry.reding@gmail.com>, <airlied@linux.ie>, <tomi.valkeinen@ti.com>
Cc: <daniel.vetter@ffwll.ch>, <dri-devel@lists.freedesktop.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 17/26] drm/omap: omap_display_timings: Use display_flags for double_pixel mode
Date: Thu, 1 Sep 2016 14:23:11 +0300 [thread overview]
Message-ID: <20160901112320.15246-18-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160901112320.15246-1-peter.ujfalusi@ti.com>
In preparation to move the stack to use the generic videmode
struct for display timing information.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/gpu/drm/omapdrm/dss/dispc.c | 6 +++---
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +-
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 ++--
drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 3 +--
drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 --
drivers/gpu/drm/omapdrm/omap_connector.c | 5 +++--
7 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index ae1e25b33391..39a9c34694f5 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -3270,8 +3270,9 @@ void dispc_mgr_set_timings(enum omap_channel channel,
t.vactive /= 2;
if (dispc.feat->supports_double_pixel)
- REG_FLD_MOD(DISPC_CONTROL, t.double_pixel ? 1 : 0,
- 19, 17);
+ REG_FLD_MOD(DISPC_CONTROL,
+ !!(t.flags & DISPLAY_FLAGS_DOUBLECLK),
+ 19, 17);
}
dispc_mgr_set_size(channel, t.hactive, t.vactive);
@@ -4206,7 +4207,6 @@ static const struct dispc_errata_i734_data {
.vsync_len = 1, .vfront_porch = 1, .vback_porch = 1,
.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
- .double_pixel = false,
.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
DISPLAY_FLAGS_DE_HIGH,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 2a5a71a25423..891518502d3d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -175,7 +175,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
p->vactive);
pc = p->pixelclock;
- if (p->double_pixel)
+ if (p->flags & DISPLAY_FLAGS_DOUBLECLK)
pc *= 2;
/* DSS_HDMI_TCLK is bitclk / 10 */
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 45f445523a4f..8206ef69caf1 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -187,7 +187,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
p->vactive);
pc = p->pixelclock;
- if (p->double_pixel)
+ if (p->flags & DISPLAY_FLAGS_DOUBLECLK)
pc *= 2;
/* DSS_HDMI_TCLK is bitclk / 10 */
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index f64f389939d1..e86972b98a91 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -315,7 +315,7 @@ static void hdmi_core_init(struct hdmi_core_vid_config *video_cfg,
video_cfg->v_fc_config.timings.vback_porch /= 2;
}
- if (cfg->timings.double_pixel) {
+ if (cfg->timings.flags & DISPLAY_FLAGS_DOUBLECLK) {
video_cfg->v_fc_config.timings.hactive *= 2;
video_cfg->hblank *= 2;
video_cfg->v_fc_config.timings.hfront_porch *= 2;
@@ -382,7 +382,7 @@ static void hdmi_core_video_config(struct hdmi_core_data *core,
REG_FLD_MOD(base, HDMI_CORE_FC_INVIDCONF,
cfg->v_fc_config.hdmi_dvi_mode, 3, 3);
- if (ovt->double_pixel)
+ if (ovt->flags & DISPLAY_FLAGS_DOUBLECLK)
REG_FLD_MOD(base, HDMI_CORE_FC_PRCONF, 2, 7, 4);
else
REG_FLD_MOD(base, HDMI_CORE_FC_PRCONF, 1, 7, 4);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index b86e5a357456..20effa9260ec 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -208,7 +208,6 @@ void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
timings->vfront_porch = param->timings.vfront_porch;
timings->vsync_len = param->timings.vsync_len;
- timings->double_pixel = param->timings.double_pixel;
timings->flags = param->timings.flags;
if (param->timings.flags & DISPLAY_FLAGS_INTERLACED) {
@@ -218,7 +217,7 @@ void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
timings->vsync_len /= 2;
}
- if (param->timings.double_pixel) {
+ if (param->timings.flags & DISPLAY_FLAGS_DOUBLECLK) {
video_fmt->x_res *= 2;
timings->hfront_porch *= 2;
timings->hsync_len *= 2;
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 4aa8ebfa69fc..b14d2a72b966 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -324,8 +324,6 @@ struct omap_video_timings {
/* Pixel clock edges to drive HSYNC and VSYNC signals */
enum omap_dss_signal_edge sync_pclk_edge;
- bool double_pixel;
-
enum display_flags flags; /* display flags */
};
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 8817e38761ae..f3e9bcf1f784 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -62,7 +62,7 @@ void copy_timings_omap_to_drm(struct drm_display_mode *mode,
if (timings->flags & DISPLAY_FLAGS_INTERLACED)
mode->flags |= DRM_MODE_FLAG_INTERLACE;
- if (timings->double_pixel)
+ if (timings->flags & DISPLAY_FLAGS_DOUBLECLK)
mode->flags |= DRM_MODE_FLAG_DBLCLK;
if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)
@@ -94,7 +94,8 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
timings->flags |= DISPLAY_FLAGS_INTERLACED;
- timings->double_pixel = !!(mode->flags & DRM_MODE_FLAG_DBLCLK);
+ if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+ timings->flags |= DISPLAY_FLAGS_DOUBLECLK;
if (mode->flags & DRM_MODE_FLAG_PHSYNC)
timings->flags |= DISPLAY_FLAGS_HSYNC_HIGH;
--
2.9.3
next prev parent reply other threads:[~2016-09-01 11:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-01 11:22 [PATCH 00/26] drm/omap: Convert to use videomode from omap_video_timings Peter Ujfalusi
2016-09-01 11:22 ` [PATCH 01/26] dt-bindings: display: display-timing: Add property to configure sync drive edge Peter Ujfalusi
2016-09-12 13:05 ` Rob Herring
2016-09-12 13:22 ` Peter Ujfalusi
2016-09-01 11:22 ` [PATCH 02/26] video: display_timing: Add flags to select the edge when the sync is driven Peter Ujfalusi
2016-09-01 11:22 ` [PATCH 03/26] video: of: display_timing: Add support for syncclk-active property Peter Ujfalusi
2016-09-01 11:22 ` [PATCH 04/26] drm/omap: omap_display_timings: rename x_res to hactive Peter Ujfalusi
2016-09-15 11:58 ` Tomi Valkeinen
2016-09-01 11:22 ` [PATCH 05/26] drm/omap: omap_display_timings: rename y_res to vactive Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 06/26] drm/omap: omap_display_timings: rename hsw to hsync_len Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 07/26] drm/omap: omap_display_timings: rename hfp to hfront_porch Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 08/26] drm/omap: omap_display_timings: rename hbp to hback_porch Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 09/26] drm/omap: omap_display_timings: rename vsw to vsync_len Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 10/26] drm/omap: omap_display_timings: rename vfp to vfront_porch Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 11/26] drm/omap: omap_display_timings: rename vbp to vback_porch Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 12/26] drm/omap: HDMI5: Use pointer to cfg->v_fc_config.timings in hdmi_core_video_config Peter Ujfalusi
2016-09-15 12:03 ` Tomi Valkeinen
2016-09-01 11:23 ` [PATCH 13/26] drm/omap: omap_display_timings: Use display_flags for interlace mode Peter Ujfalusi
2016-09-15 12:06 ` Tomi Valkeinen
2016-09-01 11:23 ` [PATCH 14/26] drm/omap: dispc: Simplify _dispc_mgr_set_lcd_timings() parameters Peter Ujfalusi
2016-09-15 12:09 ` Tomi Valkeinen
2016-09-01 11:23 ` [PATCH 15/26] drm/omap: omap_display_timings: Use display_flags for h/vsync level Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 16/26] drm/omap: omap_display_timings: Use display_flags for DE level Peter Ujfalusi
2016-09-01 11:23 ` Peter Ujfalusi [this message]
2016-09-01 11:23 ` [PATCH 18/26] drm/omap: omap_display_timings: Use display_flags for pixel data edge Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 19/26] drm/omap: omap_display_timings: Use display_flags for sync edge Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 20/26] drm/omap: Change the types of struct omap_video_timings members Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 21/26] drm/omap: Replace struct omap_video_timings with videomode Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 22/26] drm/omap: Use consistent name for struct videomode Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 23/26] drm/omap: panel-tpo-td043mtea1: Add note for incorrect sync drive edge Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 24/26] drm/omap: panel-tpo-td028ttec1: " Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 25/26] drm/omap: panel-sharp-ls037v7dw01: Add note for incorrect data " Peter Ujfalusi
2016-09-01 11:23 ` [PATCH 26/26] drm/omap: panel-lgphilips-lb035q02: Add note for incorrect data drive edge and DE level Peter Ujfalusi
2016-12-14 21:32 ` [PATCH 00/26] drm/omap: Convert to use videomode from omap_video_timings Laurent Pinchart
2016-12-15 7:56 ` Tomi Valkeinen
2016-12-15 8:12 ` Peter Ujfalusi
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=20160901112320.15246-18-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thierry.reding@gmail.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: 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
all inboxes | Powered by JetHome®