Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410997 > unrolled thread

[PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

Started byPeter Ujfalusi <peter.ujfalusi@ti.com>
First post2016-06-01 11:00 +0200
Last post2016-06-07 08:00 +0200
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-01 11:00 +0200
    [PATCH v2 01/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-01 11:00 +0200
    Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Tomi Valkeinen <tomi.valkeinen@ti.com> - 2016-06-02 14:30 +0200
      Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Tony Lindgren <tony@atomide.com> - 2016-06-02 17:30 +0200
        Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Tomi Valkeinen <tomi.valkeinen@ti.com> - 2016-06-03 13:00 +0200
          Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Tony Lindgren <tony@atomide.com> - 2016-06-07 08:00 +0200

#1410997 — [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-01 11:00 +0200
Subject[PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rF9QZ-641-5@gated-at.bofh.it>
Hi,

Changes since v1:
- patches (2) added to remove the inclusion of video/omap-panel-data.h when it
  is not needed
- Transitional patch to create the video/omapfb_dss.h has been changed to copy
  the content of the omapdss.h in one step.

omapfb is deprecated. It will not receive new features, only bug fixes. On the.
other hand omapdrm is in active development and the fact that both
implementation (omapfb and omapdrm) is using the same header file
(video/omapdss.h) makes implementing new features or doing bigger clean ups in
omapdrm harder and hared as the change should not break omapfb.

To overcome this issue we need to separate the two implementation. This is the
aim of this series:
Create platform_data header for omapdss,
clean up the header usage and dependencies,
new header file for omapfb stack (video/omapfb_dss.h)
local omapdss.h header file for omapdrm.

Regards,
Peter
---
Peter Ujfalusi (27):
  omapfb: panel-tpo-td028ttec1: Remove legacy boot support
  omapfb: panel-nec-nl8048hl11: Remove legacy boot support
  omapfb: panel-tpo-td043mtea1: Remove legacy boot support
  omapfb: panel-sharp-ls037v7dw01: Remove legacy boot support
  omapfb: panel-lgphilips-lb035q02: Remove legacy boot support
  omapfb: panel-dsi-cm: Remove legacy boot support
  omapfb: connector-hdmi: Remove legacy boot support
  omapfb: connector-dvi: Remove legacy boot support
  omapfb: encoder-tfp410: Remove legacy boot support
  omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h
  drm/omap: displays: Do not include video/omap-panel-data.h if not
    needed
  omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration
  drm/omap: connector-analog-tv: Support only Composite type in legacy
    boot
  omapfb: connector-analog-tv: Support only Composite type in legacy
    boot
  ARM: OMAP: rx51-video: Do not set TV connector_type
  omapdss: omap-panel-data.h: Remove connector_type from atv pdata
  ARM/video: omap2: Move omap_display_init declaration to
    mach-omap2/display.h
  drm/omap: Remove reference to pdata->default_device
  omapfb: Remove reference to pdata->default_device
  video: omapdss: Remove unused members from struct omap_dss_board_info
  video/platform_data: omapdss: Create new header file for platform data
  ARM: OMAP2: Use the platform_data header for omapdss
  omapdss: hdmi audio: Make header file independent of video/omapdss.h
  drm/omap: Do not include video/omapdss.h directly in drivers
  omapfb: Create new header file for omapfb DSS implementation
  [media] omap_vout: Switch to use the video/omapfb_dss.h header file
  drm/omap: Remove the video/omapdss.h and move it's content to local
    header file

 arch/arm/mach-omap2/board-ldp.c                    |   3 +-
 arch/arm/mach-omap2/board-rx51-video.c             |   4 +-
 arch/arm/mach-omap2/display.c                      |   2 +-
 arch/arm/mach-omap2/display.h                      |   5 +
 arch/arm/mach-omap2/dss-common.c                   |   2 +-
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  11 +-
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |   4 +-
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |   4 +-
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |   2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |   3 +-
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |   3 +-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c       |   3 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |   4 +-
 .../omapdrm/displays/panel-lgphilips-lb035q02.c    |   3 +-
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c    |   2 +-
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |   3 +-
 .../drm/omapdrm/displays/panel-sony-acx565akm.c    |   3 +-
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c    |   3 +-
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c    |   2 +-
 drivers/gpu/drm/omapdrm/dss/core.c                 |   5 +-
 drivers/gpu/drm/omapdrm/dss/dispc.c                |   3 +-
 drivers/gpu/drm/omapdrm/dss/dispc_coefs.c          |   2 +-
 drivers/gpu/drm/omapdrm/dss/display.c              |   2 +-
 drivers/gpu/drm/omapdrm/dss/dpi.c                  |   3 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |   2 +-
 drivers/gpu/drm/omapdrm/dss/dss-of.c               |   3 +-
 drivers/gpu/drm/omapdrm/dss/dss.c                  |   3 +-
 drivers/gpu/drm/omapdrm/dss/dss_features.c         |   3 +-
 drivers/gpu/drm/omapdrm/dss/hdmi.h                 |   3 +-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c                |   2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c                |   2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_common.c          |   2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_phy.c             |   2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_pll.c             |   3 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_wp.c              |   2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h              | 866 ++++++++++++++++++++-
 drivers/gpu/drm/omapdrm/dss/output.c               |   3 +-
 drivers/gpu/drm/omapdrm/dss/pll.c                  |   3 +-
 drivers/gpu/drm/omapdrm/dss/rfbi.c                 |   2 +-
 drivers/gpu/drm/omapdrm/dss/sdi.c                  |   2 +-
 drivers/gpu/drm/omapdrm/dss/venc.c                 |   3 +-
 drivers/gpu/drm/omapdrm/dss/video-pll.c            |   3 +-
 drivers/gpu/drm/omapdrm/omap_drv.h                 |   1 -
 drivers/media/platform/omap/omap_vout.c            |   2 +-
 drivers/media/platform/omap/omap_voutdef.h         |   2 +-
 drivers/media/platform/omap/omap_voutlib.c         |   2 +-
 .../omap2/omapfb/displays/connector-analog-tv.c    |  10 +-
 .../fbdev/omap2/omapfb/displays/connector-dvi.c    |  60 +-
 .../fbdev/omap2/omapfb/displays/connector-hdmi.c   |  44 +-
 .../fbdev/omap2/omapfb/displays/encoder-opa362.c   |   2 +-
 .../fbdev/omap2/omapfb/displays/encoder-tfp410.c   |  46 +-
 .../omap2/omapfb/displays/encoder-tpd12s015.c      |   3 +-
 .../video/fbdev/omap2/omapfb/displays/panel-dpi.c  |   2 +-
 .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c     |  54 +-
 .../omapfb/displays/panel-lgphilips-lb035q02.c     |  58 +-
 .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   |  47 +-
 .../omapfb/displays/panel-sharp-ls037v7dw01.c      |  83 +-
 .../omap2/omapfb/displays/panel-sony-acx565akm.c   |   2 +-
 .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   |  45 +-
 .../omap2/omapfb/displays/panel-tpo-td043mtea1.c   |  46 +-
 drivers/video/fbdev/omap2/omapfb/dss/apply.c       |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/core.c        |   4 +-
 .../video/fbdev/omap2/omapfb/dss/dispc-compat.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dispc.c       |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c |   2 +-
 .../video/fbdev/omap2/omapfb/dss/display-sysfs.c   |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/display.c     |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dpi.c         |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dsi.c         |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dss-of.c      |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dss.c         |   2 +-
 .../video/fbdev/omap2/omapfb/dss/dss_features.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi.h        |   3 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c       |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c       |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c     |   2 +-
 .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c   |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/manager.c     |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/output.c      |   2 +-
 .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c   |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/overlay.c     |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/pll.c         |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c        |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/sdi.c         |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/venc.c        |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/video-pll.c   |   2 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-main.c     |   2 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c    |   2 +-
 drivers/video/fbdev/omap2/omapfb/omapfb.h          |   2 +-
 include/linux/platform_data/omapdss.h              |  37 +
 include/sound/omap-hdmi-audio.h                    |   9 +-
 include/video/omap-panel-data.h                    | 157 ----
 include/video/{omapdss.h => omapfb_dss.h}          |  60 +-
 sound/soc/omap/omap-hdmi-audio.c                   |   1 -
 98 files changed, 1081 insertions(+), 751 deletions(-)
 create mode 100644 include/linux/platform_data/omapdss.h
 rename include/video/{omapdss.h => omapfb_dss.h} (93%)

-- 
2.8.3

[toc] | [next] | [standalone]

#1410998 — [PATCH v2 01/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-01 11:00 +0200
Subject[PATCH v2 01/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support
Message-ID<rFaao-6aY-53@gated-at.bofh.it>
In reply to#1410997
The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   | 43 +++-------------------
 include/video/omap-panel-data.h                    | 13 -------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
index 4d657f3ab679..f4dc023868ae 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
@@ -29,7 +29,6 @@
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
 #include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 
 struct panel_drv_data {
 	struct omap_dss_device dssdev;
@@ -365,31 +364,6 @@ static struct omap_dss_driver td028ttec1_ops = {
 	.check_timings	= td028ttec1_panel_check_timings,
 };
 
-static int td028ttec1_panel_probe_pdata(struct spi_device *spi)
-{
-	const struct panel_tpo_td028ttec1_platform_data *pdata;
-	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-	struct omap_dss_device *dssdev, *in;
-
-	pdata = dev_get_platdata(&spi->dev);
-
-	in = omap_dss_find_output(pdata->source);
-	if (in == NULL) {
-		dev_err(&spi->dev, "failed to find video source '%s'\n",
-				pdata->source);
-		return -EPROBE_DEFER;
-	}
-
-	ddata->in = in;
-
-	ddata->data_lines = pdata->data_lines;
-
-	dssdev = &ddata->dssdev;
-	dssdev->name = pdata->name;
-
-	return 0;
-}
-
 static int td028ttec1_probe_of(struct spi_device *spi)
 {
 	struct device_node *node = spi->dev.of_node;
@@ -415,6 +389,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
 
 	dev_dbg(&spi->dev, "%s\n", __func__);
 
+	if (!spi->dev.of_node)
+		return -ENODEV;
+
 	spi->bits_per_word = 9;
 	spi->mode = SPI_MODE_3;
 
@@ -432,17 +409,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
 
 	ddata->spi_dev = spi;
 
-	if (dev_get_platdata(&spi->dev)) {
-		r = td028ttec1_panel_probe_pdata(spi);
-		if (r)
-			return r;
-	} else if (spi->dev.of_node) {
-		r = td028ttec1_probe_of(spi);
-		if (r)
-			return r;
-	} else {
-		return -ENODEV;
-	}
+	r = td028ttec1_probe_of(spi);
+	if (r)
+		return r;
 
 	ddata->videomode = td028ttec1_panel_timings;
 
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 56830d1dc762..fbdaa4c3ae96 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -223,17 +223,4 @@ struct panel_nec_nl8048hl11_platform_data {
 	int qvga_gpio;
 };
 
-/**
- * panel-tpo-td028ttec1 platform data
- * @name: name for display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- */
-struct panel_tpo_td028ttec1_platform_data {
-	const char *name;
-	const char *source;
-
-	int data_lines;
-};
-
 #endif /* __OMAP_PANEL_DATA_H */
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

#1412180 — Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromTomi Valkeinen <tomi.valkeinen@ti.com>
Date2016-06-02 14:30 +0200
SubjectRe: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rFzV7-5SN-5@gated-at.bofh.it>
In reply to#1410997

[Multipart message — attachments visible in raw view] — view raw

Hi Tony,

On 01/06/16 11:35, Peter Ujfalusi wrote:
> Hi,
> 
> Changes since v1:
> - patches (2) added to remove the inclusion of video/omap-panel-data.h when it
>   is not needed
> - Transitional patch to create the video/omapfb_dss.h has been changed to copy
>   the content of the omapdss.h in one step.
> 
> omapfb is deprecated. It will not receive new features, only bug fixes. On the.
> other hand omapdrm is in active development and the fact that both
> implementation (omapfb and omapdrm) is using the same header file
> (video/omapdss.h) makes implementing new features or doing bigger clean ups in
> omapdrm harder and hared as the change should not break omapfb.
> 
> To overcome this issue we need to separate the two implementation. This is the
> aim of this series:
> Create platform_data header for omapdss,
> clean up the header usage and dependencies,
> new header file for omapfb stack (video/omapfb_dss.h)
> local omapdss.h header file for omapdrm.

Tony, can you have a look at the arch/arm parts here and give your ack
if they're fine? They should be quite small and display specific, so I
don't see much chance for conflict there.

 Tomi

[toc] | [prev] | [next] | [standalone]

#1412348 — Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromTony Lindgren <tony@atomide.com>
Date2016-06-02 17:30 +0200
SubjectRe: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rFCJj-7Au-1@gated-at.bofh.it>
In reply to#1412180
* Tomi Valkeinen <tomi.valkeinen@ti.com> [160602 05:28]:
> 
> Tony, can you have a look at the arch/arm parts here and give your ack
> if they're fine? They should be quite small and display specific, so I
> don't see much chance for conflict there.

Looks good to me, but these are going to conflict with the board-*.c
removal patches. And those we want to have easily revertable in case
of issues.

Peter, can you do an immutable minimal branch of just the pdata
changes affecting the board-*.c files? That way both Tomi and I
can merge that in.

Regards,

Tony

[toc] | [prev] | [next] | [standalone]

#1413062 — Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromTomi Valkeinen <tomi.valkeinen@ti.com>
Date2016-06-03 13:00 +0200
SubjectRe: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rFUZz-25k-25@gated-at.bofh.it>
In reply to#1412348

[Multipart message — attachments visible in raw view] — view raw

On 02/06/16 18:23, Tony Lindgren wrote:
> * Tomi Valkeinen <tomi.valkeinen@ti.com> [160602 05:28]:
>>
>> Tony, can you have a look at the arch/arm parts here and give your ack
>> if they're fine? They should be quite small and display specific, so I
>> don't see much chance for conflict there.
> 
> Looks good to me, but these are going to conflict with the board-*.c
> removal patches. And those we want to have easily revertable in case
> of issues.
> 
> Peter, can you do an immutable minimal branch of just the pdata
> changes affecting the board-*.c files? That way both Tomi and I
> can merge that in.

I wonder how minimal it can be, as I think most of the patches are
needed for pdata changes. Well, Peter can tell better.

What board changes do you expect for the next merge window? If it's just
"git rm boardfile.c", that should be an easy conflict to resolve, right?

 Tomi

[toc] | [prev] | [next] | [standalone]

#1415719 — Re: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromTony Lindgren <tony@atomide.com>
Date2016-06-07 08:00 +0200
SubjectRe: [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rHids-73B-17@gated-at.bofh.it>
In reply to#1413062
* Tomi Valkeinen <tomi.valkeinen@ti.com> [160603 03:53]:
> 
> 
> On 02/06/16 18:23, Tony Lindgren wrote:
> > * Tomi Valkeinen <tomi.valkeinen@ti.com> [160602 05:28]:
> >>
> >> Tony, can you have a look at the arch/arm parts here and give your ack
> >> if they're fine? They should be quite small and display specific, so I
> >> don't see much chance for conflict there.
> > 
> > Looks good to me, but these are going to conflict with the board-*.c
> > removal patches. And those we want to have easily revertable in case
> > of issues.
> > 
> > Peter, can you do an immutable minimal branch of just the pdata
> > changes affecting the board-*.c files? That way both Tomi and I
> > can merge that in.
> 
> I wonder how minimal it can be, as I think most of the patches are
> needed for pdata changes. Well, Peter can tell better.

Looks like Peter's new series deals with it just fine.

> What board changes do you expect for the next merge window? If it's just
> "git rm boardfile.c", that should be an easy conflict to resolve, right?

Trivial but no need to create these merge conflicts here.

Regards,

Tony

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web