[PATCH v2 01/23] drm/omap: omap_display_timings: rename x_res to hactive

[Peter Ujfalusi]

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 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c   |  2 +-
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c|  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c  |  8 
 .../drm/omapdrm/displays/panel-lgphilips-lb035q02.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c  |  2 +-
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c   |  2 +-
 .../gpu/drm/omapdrm/displays/panel-sony-acx565akm.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/dispc.c  | 16 
 drivers/gpu/drm/omapdrm/dss/display.c|  6 +++---
 drivers/gpu/drm/omapdrm/dss/dpi.c|  2 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c| 20 ++--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5_core.c |  6 +++---
 drivers/gpu/drm/omapdrm/dss/hdmi_wp.c|  2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h|  2 +-
 drivers/gpu/drm/omapdrm/dss/rfbi.c   |  6 +++---
 drivers/gpu/drm/omapdrm/dss/venc.c   |  4 ++--
 drivers/gpu/drm/omapdrm/omap_connector.c |  4 ++--
 22 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 3485d1ecd655..190a03672181 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -30,7 +30,7 @@ struct panel_drv_data {
 };
 
 static const struct omap_video_timings tvc_pal_timings = {
-   .x_res  = 720,
+   .hactive= 720,
.y_res  = 574,
.pixelclock = 1350,
.hsw= 64,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 684b7aeda411..c6e02e1a3799 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -20,7 +20,7 @@
 #include "../dss/omapdss.h"
 
 static const struct omap_video_timings dvic_default_timings = {
-   .x_res  = 640,
+   .hactive= 640,
.y_res  = 480,
 
.pixelclock = 2350,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 7bdf83af9797..ef5ae08b362b 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -22,7 +22,7 @@
 #include "../dss/omapdss.h"
 
 static const struct omap_video_timings hdmic_default_timings = {
-   .x_res  = 640,
+   .hactive= 640,
.y_res  = 480,
.pixelclock = 25175000,
.hsw= 96,
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 0eae8afaed90..d6c63d57a274 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -383,7 +383,7 @@ static const struct backlight_ops dsicm_bl_ops = {
 static void dsicm_get_resolution(struct omap_dss_device *dssdev,
u16 *xres, u16 *yres)
 {
-   *xres = dssdev->panel.timings.x_res;
+   *xres = dssdev->panel.timings.hactive;
*yres = dssdev->panel.timings.y_res;
 }
 
@@ -893,7 +893,7 @@ static int dsicm_update(struct omap_dss_device *dssdev,
 
/* XXX no need to send this every frame, but dsi break if not done */
r = dsicm_set_update_window(ddata, 0, 0,
-   dssdev->panel.timings.x_res,
+   dssdev->panel.timings.hactive,
dssdev->panel.timings.y_res);
if (r)
goto err;
@@ -1025,7 +1025,7 @@ static int dsicm_memory_read(struct omap_dss_device 
*dssdev,
}
 
size = min(w * h * 3,
-   dssdev->panel.timings.x_res *
+   dssdev->panel.timings.hactive *
dssdev->panel.timings.y_res * 3);
 
in->ops.dsi->bus_lock(in);
@@ -1187,7 +1187,7 @@ static int dsicm_probe(struct platform_device *pdev)
if (r)
return r;
 
-   ddata->timings.x_res = 864;
+   ddata->timings.hactive = 864;
ddata->timings.y_res = 480;
ddata->timings.pixelclock = 864 * 480 * 60;
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c 

[PATCH v2 01/23] drm/omap: omap_display_timings: rename x_res to hactive

[Peter Ujfalusi]

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 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c   |  2 +-
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c|  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c  |  8 
 .../drm/omapdrm/displays/panel-lgphilips-lb035q02.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c  |  2 +-
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c   |  2 +-
 .../gpu/drm/omapdrm/displays/panel-sony-acx565akm.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c  |  2 +-
 .../gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/dispc.c  | 16 
 drivers/gpu/drm/omapdrm/dss/display.c|  6 +++---
 drivers/gpu/drm/omapdrm/dss/dpi.c|  2 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c| 20 ++--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5_core.c |  6 +++---
 drivers/gpu/drm/omapdrm/dss/hdmi_wp.c|  2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h|  2 +-
 drivers/gpu/drm/omapdrm/dss/rfbi.c   |  6 +++---
 drivers/gpu/drm/omapdrm/dss/venc.c   |  4 ++--
 drivers/gpu/drm/omapdrm/omap_connector.c |  4 ++--
 22 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 3485d1ecd655..190a03672181 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -30,7 +30,7 @@ struct panel_drv_data {
 };
 
 static const struct omap_video_timings tvc_pal_timings = {
-   .x_res  = 720,
+   .hactive= 720,
.y_res  = 574,
.pixelclock = 1350,
.hsw= 64,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 684b7aeda411..c6e02e1a3799 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -20,7 +20,7 @@
 #include "../dss/omapdss.h"
 
 static const struct omap_video_timings dvic_default_timings = {
-   .x_res  = 640,
+   .hactive= 640,
.y_res  = 480,
 
.pixelclock = 2350,
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 7bdf83af9797..ef5ae08b362b 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -22,7 +22,7 @@
 #include "../dss/omapdss.h"
 
 static const struct omap_video_timings hdmic_default_timings = {
-   .x_res  = 640,
+   .hactive= 640,
.y_res  = 480,
.pixelclock = 25175000,
.hsw= 96,
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 0eae8afaed90..d6c63d57a274 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -383,7 +383,7 @@ static const struct backlight_ops dsicm_bl_ops = {
 static void dsicm_get_resolution(struct omap_dss_device *dssdev,
u16 *xres, u16 *yres)
 {
-   *xres = dssdev->panel.timings.x_res;
+   *xres = dssdev->panel.timings.hactive;
*yres = dssdev->panel.timings.y_res;
 }
 
@@ -893,7 +893,7 @@ static int dsicm_update(struct omap_dss_device *dssdev,
 
/* XXX no need to send this every frame, but dsi break if not done */
r = dsicm_set_update_window(ddata, 0, 0,
-   dssdev->panel.timings.x_res,
+   dssdev->panel.timings.hactive,
dssdev->panel.timings.y_res);
if (r)
goto err;
@@ -1025,7 +1025,7 @@ static int dsicm_memory_read(struct omap_dss_device 
*dssdev,
}
 
size = min(w * h * 3,
-   dssdev->panel.timings.x_res *
+   dssdev->panel.timings.hactive *
dssdev->panel.timings.y_res * 3);
 
in->ops.dsi->bus_lock(in);
@@ -1187,7 +1187,7 @@ static int dsicm_probe(struct platform_device *pdev)
if (r)
return r;
 
-   ddata->timings.x_res = 864;
+   ddata->timings.hactive = 864;
ddata->timings.y_res = 480;
ddata->timings.pixelclock = 864 * 480 * 60;
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c 
b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index