summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_connector.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2016-09-22 14:06:46 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-11-02 10:48:18 +0200
commit81899060de35d80f17020d322e77311f1b255885 (patch)
tree38f3e5d75e99aef3623eb7f8f0392dba48afa697 /drivers/gpu/drm/omapdrm/omap_connector.c
parentbd9642b9b8d329bcb0b187aee34c89fc182f2c4d (diff)
downloadlinux-81899060de35d80f17020d322e77311f1b255885.tar.bz2
drm/omap: omap_display_timings: rename x_res to hactive
In preparation to move the stack to use the generic videmode struct for display timing information rename the x_res member to hactive. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_connector.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_connector.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 137fe690a0da..bc33ce34a856 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -47,7 +47,7 @@ void copy_timings_omap_to_drm(struct drm_display_mode *mode,
{
mode->clock = timings->pixelclock / 1000;
- mode->hdisplay = timings->x_res;
+ mode->hdisplay = timings->hactive;
mode->hsync_start = mode->hdisplay + timings->hfp;
mode->hsync_end = mode->hsync_start + timings->hsw;
mode->htotal = mode->hsync_end + timings->hbp;
@@ -81,7 +81,7 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
{
timings->pixelclock = mode->clock * 1000;
- timings->x_res = mode->hdisplay;
+ timings->hactive = mode->hdisplay;
timings->hfp = mode->hsync_start - mode->hdisplay;
timings->hsw = mode->hsync_end - mode->hsync_start;
timings->hbp = mode->htotal - mode->hsync_end;