[Bug 99368] Full aspect scaling introduces interlacing on specific resolutions

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=99368

--- Comment #7 from Platin  ---
The issue is fixed on the mainline kernel 4.17.0-rc6 using the amdgpu drm
driver. This was recently fixed it seems since the issue persists on 4.16.11.

It is required to force enable DC though. Without it, it won't work.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[drm-intel:for-linux-next-fixes 4/4] include/linux/compiler.h:339:38: error: call to '__compiletime_assert_119' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)

[kbuild test robot]

tree:   git://anongit.freedesktop.org/drm-intel for-linux-next-fixes
head:   57ebdafc306af9decd893b4cb11bd834a7e27ed1
commit: 57ebdafc306af9decd893b4cb11bd834a7e27ed1 [4/4] drm/i915/query: Protect 
tainted function pointer lookup
config: i386-randconfig-s0-201821 (attached as .config)
compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026
reproduce:
git checkout 57ebdafc306af9decd893b4cb11bd834a7e27ed1
# save the attached .config to linux build tree
make ARCH=i386 

All errors (new ones prefixed by >>):

   In file included from include/asm-generic/barrier.h:20:0,
from arch/x86/include/asm/barrier.h:86,
from include/linux/nospec.h:8,
from drivers/gpu//drm/i915/i915_query.c:7:
   drivers/gpu//drm/i915/i915_query.c: In function 'i915_query_ioctl':
>> include/linux/compiler.h:339:38: error: call to '__compiletime_assert_119' 
>> declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
 _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
 ^
   include/linux/compiler.h:319:4: note: in definition of macro 
'__compiletime_assert'
   prefix ## suffix();\
   ^~
   include/linux/compiler.h:339:2: note: in expansion of macro 
'_compiletime_assert'
 _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
 ^~~
   include/linux/build_bug.h:45:37: note: in expansion of macro 
'compiletime_assert'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^~
   include/linux/build_bug.h:69:2: note: in expansion of macro 
'BUILD_BUG_ON_MSG'
 BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
 ^~~~
   include/linux/nospec.h:53:2: note: in expansion of macro 'BUILD_BUG_ON'
 BUILD_BUG_ON(sizeof(_i) > sizeof(long));   \
 ^~~~
   drivers/gpu//drm/i915/i915_query.c:118:15: note: in expansion of macro 
'array_index_nospec'
   func_idx = array_index_nospec(func_idx,
  ^~
--
   In file included from include/asm-generic/barrier.h:20:0,
from arch/x86/include/asm/barrier.h:86,
from include/linux/nospec.h:8,
from drivers/gpu/drm/i915/i915_query.c:7:
   drivers/gpu/drm/i915/i915_query.c: In function 'i915_query_ioctl':
>> include/linux/compiler.h:339:38: error: call to '__compiletime_assert_119' 
>> declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
 _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
 ^
   include/linux/compiler.h:319:4: note: in definition of macro 
'__compiletime_assert'
   prefix ## suffix();\
   ^~
   include/linux/compiler.h:339:2: note: in expansion of macro 
'_compiletime_assert'
 _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
 ^~~
   include/linux/build_bug.h:45:37: note: in expansion of macro 
'compiletime_assert'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^~
   include/linux/build_bug.h:69:2: note: in expansion of macro 
'BUILD_BUG_ON_MSG'
 BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
 ^~~~
   include/linux/nospec.h:53:2: note: in expansion of macro 'BUILD_BUG_ON'
 BUILD_BUG_ON(sizeof(_i) > sizeof(long));   \
 ^~~~
   drivers/gpu/drm/i915/i915_query.c:118:15: note: in expansion of macro 
'array_index_nospec'
   func_idx = array_index_nospec(func_idx,
  ^~

vim +/__compiletime_assert_119 +339 include/linux/compiler.h

9a8ab1c3 Daniel Santos 2013-02-21  325  
9a8ab1c3 Daniel Santos 2013-02-21  326  #define _compiletime_assert(condition, 
msg, prefix, suffix) \
9a8ab1c3 Daniel Santos 2013-02-21  327  __compiletime_assert(condition, 
msg, prefix, suffix)
9a8ab1c3 Daniel Santos 2013-02-21  328  
9a8ab1c3 Daniel Santos 2013-02-21  329  /**
9a8ab1c3 Daniel Santos 2013-02-21  330   * compiletime_assert - break build and 
emit msg if condition is false
9a8ab1c3 Daniel Santos 2013-02-21  331   * @condition: a compile-time constant 
condition to check
9a8ab1c3 Daniel Santos 2013-02-21  332   * @msg:   a message to emit if 
condition is false
9a8ab1c3 Daniel Santos 2013-02-21  333   *
9a8ab1c3 Daniel Santos 2013-02-21  334   * In tradition of POSIX assert, this 
macro will break the build if the
9a8ab1c3 Daniel Santos 2013-02-21  335   * supplied condition is *false*, 
emitting the supplied error message if the
9a8ab1c3 Daniel Santos 2013-02-21  336   * compiler has support to do so.
9a8ab1c3 Daniel Santos 2013-02-21  337   */
9a8ab1c3 Daniel Santos 2013-02-21  338  #define compiletime_assert(condition, 
msg) \
9a8ab1c3 Daniel Santos 2013-02-21 @339  

[Bug 106670] AMD GPU Error, random lockup, Ryzen 2500U Vega 8 GPU

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=106670

--- Comment #1 from Ernst Sjöstrand  ---
Please post some information about your hardware and the kernel version you're
running. Full dmesg is also good, shows what the driver says when it's loading.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 106670] AMD GPU Error, random lockup, Ryzen 2500U Vega 8 GPU

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=106670

Ernst Sjöstrand  changed:

   What|Removed |Added

Product|Mesa|DRI
  Component|Mesa core   |DRM/AMDgpu
   Assignee|mesa-dev@lists.freedesktop. |dri-devel@lists.freedesktop
   |org |.org
 QA Contact|mesa-dev@lists.freedesktop. |
   |org |
Version|18.0|unspecified

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 106594] [radeonsi,regression,apitrace] Prison Architect rendered unplayable by multicoloured flickering triangles and overlayed triangles when performing certain actions

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=106594

--- Comment #5 from Kai  ---
I just tested Debian's 18.1.0-1 package (also built against LLVM 6.0 (package
version 1:6.0-3+b1)) and that version of Mesa doesn't produce the glitch
either, thus narrowing the regression space to:
- Mesa: between 18.1 and current HEAD of Git
- LLVM: between 6.0 and current HEAD of SVN.

Further testing with a version of Debian's 18.1.0-1 package built against LLVM
7 (SVN r39) didn't exhibit the bug either, therefore the bug must have been
introduced between Mesa 18.1.0 and the current Git HEAD of Mesa. I'll see, if I
can do a bisection.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 41/60] drm/omap: dss: hdmi5: Move initialization code from bind to probe

[Laurent Pinchart]

There's no reason to delay initialization of most of the driver (such as
mapping memory I/O or enabling runtime PM) to the component bind
handler. Perform as much of the initialization as possible at probe
time, initializing at bind time only the parts that depends on the DSS.
The cleanup code is moved from unbind to remove in a similar way.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 205 +++-
 1 file changed, 110 insertions(+), 95 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 92ae561bf974..64b45a612439 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -544,53 +544,10 @@ static const struct omap_dss_device_ops hdmi_ops = {
},
 };
 
-static void hdmi_init_output(struct omap_hdmi *hdmi)
-{
-   struct omap_dss_device *out = >output;
-
-   out->dev = >pdev->dev;
-   out->id = OMAP_DSS_OUTPUT_HDMI;
-   out->output_type = OMAP_DISPLAY_TYPE_HDMI;
-   out->name = "hdmi.0";
-   out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
-   out->ops = _ops;
-   out->owner = THIS_MODULE;
-   out->of_ports = BIT(0);
-
-   omapdss_device_register(out);
-}
-
-static void hdmi_uninit_output(struct omap_hdmi *hdmi)
-{
-   struct omap_dss_device *out = >output;
-
-   omapdss_device_unregister(out);
-}
-
-static int hdmi_probe_of(struct omap_hdmi *hdmi)
-{
-   struct platform_device *pdev = hdmi->pdev;
-   struct device_node *node = pdev->dev.of_node;
-   struct device_node *ep;
-   int r;
-
-   ep = of_graph_get_endpoint_by_regs(node, 0, 0);
-   if (!ep)
-   return 0;
-
-   r = hdmi_parse_lanes_of(pdev, ep, >phy);
-   if (r)
-   goto err;
-
-   of_node_put(ep);
-   return 0;
-
-err:
-   of_node_put(ep);
-   return r;
-}
+/* 
-
+ * Audio Callbacks
+ */
 
-/* Audio callbacks */
 static int hdmi_audio_startup(struct device *dev,
  void (*abort_cb)(struct device *dev))
 {
@@ -711,27 +668,116 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
return 0;
 }
 
-/* HDMI HW IP initialisation */
+/* 
-
+ * Component Bind & Unbind
+ */
+
 static int hdmi5_bind(struct device *dev, struct device *master, void *data)
 {
-   struct platform_device *pdev = to_platform_device(dev);
struct dss_device *dss = dss_get_device(master);
-   struct omap_hdmi *hdmi;
+   struct omap_hdmi *hdmi = dev_get_drvdata(dev);
int r;
+
+   hdmi->dss = dss;
+
+   r = hdmi_pll_init(dss, hdmi->pdev, >pll, >wp);
+   if (r)
+   return r;
+
+   r = hdmi_audio_register(hdmi);
+   if (r) {
+   DSSERR("Registering HDMI audio failed %d\n", r);
+   goto err_pll_uninit;
+   }
+
+   hdmi->debugfs = dss_debugfs_create_file(dss, "hdmi", hdmi_dump_regs,
+   hdmi);
+
+   return 0;
+
+err_pll_uninit:
+   hdmi_pll_uninit(>pll);
+   return r;
+}
+
+static void hdmi5_unbind(struct device *dev, struct device *master, void *data)
+{
+   struct omap_hdmi *hdmi = dev_get_drvdata(dev);
+
+   dss_debugfs_remove_file(hdmi->debugfs);
+
+   if (hdmi->audio_pdev)
+   platform_device_unregister(hdmi->audio_pdev);
+
+   hdmi_pll_uninit(>pll);
+}
+
+static const struct component_ops hdmi5_component_ops = {
+   .bind   = hdmi5_bind,
+   .unbind = hdmi5_unbind,
+};
+
+/* 
-
+ * Probe & Remove, Suspend & Resume
+ */
+
+static void hdmi5_init_output(struct omap_hdmi *hdmi)
+{
+   struct omap_dss_device *out = >output;
+
+   out->dev = >pdev->dev;
+   out->id = OMAP_DSS_OUTPUT_HDMI;
+   out->output_type = OMAP_DISPLAY_TYPE_HDMI;
+   out->name = "hdmi.0";
+   out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
+   out->ops = _ops;
+   out->owner = THIS_MODULE;
+   out->of_ports = BIT(0);
+
+   omapdss_device_register(out);
+}
+
+static void hdmi5_uninit_output(struct omap_hdmi *hdmi)
+{
+   struct omap_dss_device *out = >output;
+
+   omapdss_device_unregister(out);
+}
+
+static int hdmi5_probe_of(struct omap_hdmi *hdmi)
+{
+   struct platform_device *pdev = hdmi->pdev;
+   struct device_node *node = pdev->dev.of_node;
+   struct device_node *ep;
+   int r;
+
+   ep = of_graph_get_endpoint_by_regs(node, 0, 0);
+   if (!ep)
+   return 0;
+
+   r = hdmi_parse_lanes_of(pdev, ep, >phy);
+   of_node_put(ep);
+   return r;
+}
+
+static int hdmi5_probe(struct platform_device *pdev)
+{
+   struct omap_hdmi *hdmi;
int irq;
+   int r;
 

[PATCH v2 58/60] drm/omap: Remove supported output check in CRTC connect handler

[Laurent Pinchart]

The CRTC connect handler checks whether the DSS output supports the
DISPC channel assigned to it. As the channel is assigned to the output
by the output driver a failure there could only result from a driver
bug. All the output drivers have been verified and they are always
assigned a DISPC channel that is supported on the SoC they run on. The
check can thus be removed.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dispc.c   | 8 
 drivers/gpu/drm/omapdrm/dss/dss.c | 6 --
 drivers/gpu/drm/omapdrm/dss/dss.h | 2 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 --
 drivers/gpu/drm/omapdrm/omap_crtc.c   | 6 --
 5 files changed, 24 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c 
b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 7f3ac6b13b56..bc207f2fb200 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2904,13 +2904,6 @@ static int dispc_ovl_enable(struct dispc_device *dispc,
return 0;
 }
 
-static enum omap_dss_output_id
-dispc_mgr_get_supported_outputs(struct dispc_device *dispc,
-   enum omap_channel channel)
-{
-   return dss_get_supported_outputs(dispc->dss, channel);
-}
-
 static void dispc_lcd_enable_signal_polarity(struct dispc_device *dispc,
 bool act_high)
 {
@@ -4742,7 +4735,6 @@ static const struct dispc_ops dispc_ops = {
.mgr_set_lcd_config = dispc_mgr_set_lcd_config,
.mgr_set_timings = dispc_mgr_set_timings,
.mgr_setup = dispc_mgr_setup,
-   .mgr_get_supported_outputs = dispc_mgr_get_supported_outputs,
.mgr_gamma_size = dispc_mgr_gamma_size,
.mgr_set_gamma = dispc_mgr_set_gamma,
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index 5b7613ff2f2e..d2760107ccf2 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -678,12 +678,6 @@ unsigned long dss_get_max_fck_rate(struct dss_device *dss)
return dss->feat->fck_freq_max;
 }
 
-enum omap_dss_output_id dss_get_supported_outputs(struct dss_device *dss,
- enum omap_channel channel)
-{
-   return dss->feat->outputs[channel];
-}
-
 static int dss_setup_default_clock(struct dss_device *dss)
 {
unsigned long max_dss_fck, prate;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h 
b/drivers/gpu/drm/omapdrm/dss/dss.h
index 54f96241b9ea..81dd0c910ea1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -314,8 +314,6 @@ void dss_runtime_put(struct dss_device *dss);
 
 unsigned long dss_get_dispc_clk_rate(struct dss_device *dss);
 unsigned long dss_get_max_fck_rate(struct dss_device *dss);
-enum omap_dss_output_id dss_get_supported_outputs(struct dss_device *dss,
- enum omap_channel channel);
 int dss_dpi_select_source(struct dss_device *dss, int port,
  enum omap_channel channel);
 void dss_select_hdmi_venc_clk_source(struct dss_device *dss,
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index d7084ca36d0e..bb340a08c44a 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -636,8 +636,6 @@ struct dispc_ops {
const struct videomode *vm);
void (*mgr_setup)(struct dispc_device *dispc, enum omap_channel channel,
  const struct omap_overlay_manager_info *info);
-   enum omap_dss_output_id (*mgr_get_supported_outputs)(
-   struct dispc_device *dispc, enum omap_channel channel);
u32 (*mgr_gamma_size)(struct dispc_device *dispc,
  enum omap_channel channel);
void (*mgr_set_gamma)(struct dispc_device *dispc,
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 5a56c8e02179..90917d040ddb 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -114,12 +114,6 @@ static int omap_crtc_dss_connect(struct omap_drm_private 
*priv,
enum omap_channel channel,
struct omap_dss_device *dst)
 {
-   const struct dispc_ops *dispc_ops = priv->dispc_ops;
-   struct dispc_device *dispc = priv->dispc;
-
-   if (!(dispc_ops->mgr_get_supported_outputs(dispc, channel) & dst->id))
-   return -EINVAL;
-
dst->dispc_channel_connected = true;
 
return 0;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 59/60] drm/omap: Set dispc_channel_connect from DSS output connect handlers

[Laurent Pinchart]

The omap_dss_device.dispc_channel_connect field is used by DSS outputs
to fail the .enable() operation if they're not connected. Set the field
directly from the (dis)connect handlers of the DSS outputs instead of
going through the CRTC dss_mgr operations.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c   | 3 +++
 drivers/gpu/drm/omapdrm/dss/dsi.c   | 3 +++
 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 +++
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 3 +++
 drivers/gpu/drm/omapdrm/dss/sdi.c   | 3 +++
 drivers/gpu/drm/omapdrm/dss/venc.c  | 3 +++
 drivers/gpu/drm/omapdrm/omap_crtc.c | 3 ---
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 4cf397c9300e..72d873c2abcc 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -626,12 +626,15 @@ static int dpi_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void dpi_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index bc470baa4f5c..bd5e463558be 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4896,12 +4896,15 @@ static int dsi_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void dsi_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 6616530d5fe6..1e025a8b99c9 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -443,12 +443,15 @@ static int hdmi_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index f7e15edc05fc..d5860438ddd9 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -448,12 +448,15 @@ static int hdmi_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c 
b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 09c10ba4946b..ed2595a60984 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -264,12 +264,15 @@ static int sdi_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void sdi_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c 
b/drivers/gpu/drm/omapdrm/dss/venc.c
index 997c4aebd560..4f20183c7861 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -706,12 +706,15 @@ static int venc_connect(struct omap_dss_device *src,
return r;
}
 
+   dst->dispc_channel_connected = true;
return 0;
 }
 
 static void venc_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
 {
+   dst->dispc_channel_connected = false;
+
omapdss_device_disconnect(dst, dst->next);
 
dss_mgr_disconnect(dst);
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 90917d040ddb..7f837697e76c 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -114,8 +114,6 @@ static int omap_crtc_dss_connect(struct omap_drm_private 
*priv,
enum omap_channel channel,
struct omap_dss_device *dst)
 {
-   dst->dispc_channel_connected = true;
-
return 0;
 }
 
@@ -123,7 

[PATCH v2 57/60] drm/omap: Remove omap_crtc_output global array

[Laurent Pinchart]

The omap_crtc_output global array is used to look up the DSS output
device by channel. We can replace that by accessing the output device
from the pipeline if we store the pipeline pointer in the omap_crtc
structure.

The global array is also used to protect against double connection of an
output. This can't happen with the connection handling mechanism going
from DSS outputs to displays. We can thus drop that check, allowing
removal of the global array.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_crtc.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 9742d9f49a7c..5a56c8e02179 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -41,6 +41,7 @@ struct omap_crtc {
struct drm_crtc base;
 
const char *name;
+   struct omap_drm_pipeline *pipe;
enum omap_channel channel;
 
struct videomode vm;
@@ -108,9 +109,6 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
  * job of sequencing the setup of the video pipe in the proper order
  */
 
-/* ovl-mgr-id -> crtc */
-static struct omap_dss_device *omap_crtc_output[8];
-
 /* we can probably ignore these until we support command-mode panels: */
 static int omap_crtc_dss_connect(struct omap_drm_private *priv,
enum omap_channel channel,
@@ -119,13 +117,9 @@ static int omap_crtc_dss_connect(struct omap_drm_private 
*priv,
const struct dispc_ops *dispc_ops = priv->dispc_ops;
struct dispc_device *dispc = priv->dispc;
 
-   if (omap_crtc_output[channel])
-   return -EINVAL;
-
if (!(dispc_ops->mgr_get_supported_outputs(dispc, channel) & dst->id))
return -EINVAL;
 
-   omap_crtc_output[channel] = dst;
dst->dispc_channel_connected = true;
 
return 0;
@@ -135,7 +129,6 @@ static void omap_crtc_dss_disconnect(struct 
omap_drm_private *priv,
enum omap_channel channel,
struct omap_dss_device *dst)
 {
-   omap_crtc_output[channel] = NULL;
dst->dispc_channel_connected = false;
 }
 
@@ -158,7 +151,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, 
bool enable)
if (WARN_ON(omap_crtc->enabled == enable))
return;
 
-   if (omap_crtc_output[channel]->output_type == OMAP_DISPLAY_TYPE_HDMI) {
+   if (omap_crtc->pipe->output->output_type == OMAP_DISPLAY_TYPE_HDMI) {
priv->dispc_ops->mgr_enable(priv->dispc, channel, enable);
omap_crtc->enabled = enable;
return;
@@ -716,6 +709,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
init_waitqueue_head(_crtc->pending_wait);
 
+   omap_crtc->pipe = pipe;
omap_crtc->channel = channel;
omap_crtc->name = channel_names[channel];
 
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 53/60] drm/omap: dss: Move display type validation to initialization time

[Laurent Pinchart]

The display type is validated when the display is connected to the DSS
output. We already have all the information we need for validation when
initializing the outputs. Move validation to output initialization to
simplify pipeline connection handling.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c | 25 +++--
 drivers/gpu/drm/omapdrm/dss/dsi.c | 25 +++--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c   | 25 +++--
 drivers/gpu/drm/omapdrm/dss/hdmi5.c   | 25 +++--
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  3 +--
 drivers/gpu/drm/omapdrm/dss/output.c  | 17 +
 drivers/gpu/drm/omapdrm/dss/sdi.c | 25 +++--
 drivers/gpu/drm/omapdrm/dss/venc.c| 25 +++--
 8 files changed, 72 insertions(+), 98 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index dc50a220382c..831de09770a3 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -620,24 +620,13 @@ static int dpi_connect(struct omap_dss_device *src,
if (r)
return r;
 
-   r = omapdss_output_set_device(dst, dst->next);
+   r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
-   DSSERR("failed to connect output to new device: %s\n",
-   dst->name);
-   goto err_mgr_disconnect;
+   dss_mgr_disconnect(dst);
+   return r;
}
 
-   r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r)
-   goto err_output_unset;
-
return 0;
-
-err_output_unset:
-   omapdss_output_unset_device(dst);
-err_mgr_disconnect:
-   dss_mgr_disconnect(dst);
-   return r;
 }
 
 static void dpi_disconnect(struct omap_dss_device *src,
@@ -664,6 +653,7 @@ static int dpi_init_output_port(struct dpi_data *dpi, 
struct device_node *port)
 {
struct omap_dss_device *out = >output;
u32 port_num = 0;
+   int r;
 
of_property_read_u32(port, "reg", _num);
dpi->id = port_num <= 2 ? port_num : 0;
@@ -696,6 +686,13 @@ static int dpi_init_output_port(struct dpi_data *dpi, 
struct device_node *port)
return PTR_ERR(out->next);
}
 
+   r = omapdss_output_validate(out);
+   if (r) {
+   omapdss_device_put(out->next);
+   out->next = NULL;
+   return r;
+   }
+
omapdss_device_register(out);
 
return 0;
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index a5516d6e8017..53a32e20c3bd 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4890,24 +4890,13 @@ static int dsi_connect(struct omap_dss_device *src,
if (r)
return r;
 
-   r = omapdss_output_set_device(dst, dst->next);
+   r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
-   DSSERR("failed to connect output to new device: %s\n",
-   dst->name);
-   goto err_mgr_disconnect;
+   dss_mgr_disconnect(dst);
+   return r;
}
 
-   r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r)
-   goto err_output_unset;
-
return 0;
-
-err_output_unset:
-   omapdss_output_unset_device(dst);
-err_mgr_disconnect:
-   dss_mgr_disconnect(dst);
-   return r;
 }
 
 static void dsi_disconnect(struct omap_dss_device *src,
@@ -5147,6 +5136,7 @@ static const struct component_ops dsi_component_ops = {
 static int dsi_init_output(struct dsi_data *dsi)
 {
struct omap_dss_device *out = >output;
+   int r;
 
out->dev = dsi->dev;
out->id = dsi->module_id == 0 ?
@@ -5166,6 +5156,13 @@ static int dsi_init_output(struct dsi_data *dsi)
return PTR_ERR(out->next);
}
 
+   r = omapdss_output_validate(out);
+   if (r) {
+   omapdss_device_put(out->next);
+   out->next = NULL;
+   return r;
+   }
+
omapdss_device_register(out);
 
return 0;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 9f883669e71b..22f8b74f5bf5 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -437,24 +437,13 @@ static int hdmi_connect(struct omap_dss_device *src,
if (r)
return r;
 
-   r = omapdss_output_set_device(dst, dst->next);
+   r = omapdss_device_connect(dst->dss, dst, dst->next);
if (r) {
-   DSSERR("failed to connect output to new device: %s\n",
-   dst->name);
-   goto err_mgr_disconnect;
+   dss_mgr_disconnect(dst);
+   return r;
}
 
-   r = 

[PATCH v2 49/60] drm/omap: Create all planes before CRTCs

[Laurent Pinchart]

Creating all the planes in a single location instead of creating them
per-CRTC with remaining planes then created in a second step simplifies
the logic.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_drv.c | 45 --
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 0d4c3e2db058..99ed47a17ce3 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -271,14 +271,30 @@ static int omap_modeset_init(struct drm_device *dev)
return -EINVAL;
}
 
-   /* All planes can be put to any CRTC */
+   /* Create all planes first. They can all be put to any CRTC. */
plane_crtc_mask = (1 << num_crtcs) - 1;
 
+   for (i = 0; i < num_ovls; i++) {
+   enum drm_plane_type type = i < priv->num_dssdevs
+? DRM_PLANE_TYPE_PRIMARY
+: DRM_PLANE_TYPE_OVERLAY;
+   struct drm_plane *plane;
+
+   if (WARN_ON(priv->num_planes >= ARRAY_SIZE(priv->planes)))
+   return -EINVAL;
+
+   plane = omap_plane_init(dev, i, type, plane_crtc_mask);
+   if (IS_ERR(plane))
+   return PTR_ERR(plane);
+
+   priv->planes[priv->num_planes++] = plane;
+   }
+
+   /* Create the CRTCs, encoders and connectors. */
for (i = 0; i < priv->num_dssdevs; i++) {
struct omap_dss_device *dssdev = priv->dssdevs[i];
struct drm_connector *connector;
struct drm_encoder *encoder;
-   struct drm_plane *plane;
struct drm_crtc *crtc;
 
encoder = omap_encoder_init(dev, dssdev);
@@ -290,12 +306,7 @@ static int omap_modeset_init(struct drm_device *dev)
if (!connector)
return -ENOMEM;
 
-   plane = omap_plane_init(dev, i, DRM_PLANE_TYPE_PRIMARY,
-   plane_crtc_mask);
-   if (IS_ERR(plane))
-   return PTR_ERR(plane);
-
-   crtc = omap_crtc_init(dev, plane, dssdev);
+   crtc = omap_crtc_init(dev, priv->planes[i], dssdev);
if (IS_ERR(crtc))
return PTR_ERR(crtc);
 
@@ -303,28 +314,10 @@ static int omap_modeset_init(struct drm_device *dev)
encoder->possible_crtcs = 1 << i;
 
priv->crtcs[priv->num_crtcs++] = crtc;
-   priv->planes[priv->num_planes++] = plane;
priv->encoders[priv->num_encoders++] = encoder;
priv->connectors[priv->num_connectors++] = connector;
}
 
-   /*
-* Create normal planes for the remaining overlays:
-*/
-   for (; i < num_ovls; i++) {
-   struct drm_plane *plane;
-
-   if (WARN_ON(priv->num_planes >= ARRAY_SIZE(priv->planes)))
-   return -EINVAL;
-
-   plane = omap_plane_init(dev, i, DRM_PLANE_TYPE_OVERLAY,
-   plane_crtc_mask);
-   if (IS_ERR(plane))
-   return PTR_ERR(plane);
-
-   priv->planes[priv->num_planes++] = plane;
-   }
-
DBG("registered %d planes, %d crtcs, %d encoders and %d connectors\n",
priv->num_planes, priv->num_crtcs, priv->num_encoders,
priv->num_connectors);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 60/60] drm/omap: dss: Remove the dss_mgr_(dis)connect() operations

[Laurent Pinchart]

The dss_mgr .connect() and .disconnect() are implemented as no-op in
omapdrm. The operations are unneeded, remove them.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c | 10 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c | 10 +-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c   | 10 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c   | 10 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  9 -
 drivers/gpu/drm/omapdrm/dss/output.c  | 14 --
 drivers/gpu/drm/omapdrm/dss/sdi.c | 10 +-
 drivers/gpu/drm/omapdrm/dss/venc.c| 10 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c   | 15 ---
 9 files changed, 6 insertions(+), 92 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 72d873c2abcc..764ffc4bad32 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -616,15 +616,9 @@ static int dpi_connect(struct omap_dss_device *src,
 
dpi_init_pll(dpi);
 
-   r = dss_mgr_connect(dst);
-   if (r)
-   return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r) {
-   dss_mgr_disconnect(dst);
+   if (r)
return r;
-   }
 
dst->dispc_channel_connected = true;
return 0;
@@ -636,8 +630,6 @@ static void dpi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
 
omapdss_device_disconnect(dst, dst->next);
-
-   dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops dpi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index bd5e463558be..6fe9e2b78144 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4886,15 +4886,9 @@ static int dsi_connect(struct omap_dss_device *src,
 {
int r;
 
-   r = dss_mgr_connect(dst);
-   if (r)
-   return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r) {
-   dss_mgr_disconnect(dst);
+   if (r)
return r;
-   }
 
dst->dispc_channel_connected = true;
return 0;
@@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
 
omapdss_device_disconnect(dst, dst->next);
-
-   dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops dsi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 1e025a8b99c9..c4fcdc9ed62d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -433,15 +433,9 @@ static int hdmi_connect(struct omap_dss_device *src,
 {
int r;
 
-   r = dss_mgr_connect(dst);
-   if (r)
-   return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r) {
-   dss_mgr_disconnect(dst);
+   if (r)
return r;
-   }
 
dst->dispc_channel_connected = true;
return 0;
@@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
 
omapdss_device_disconnect(dst, dst->next);
-
-   dss_mgr_disconnect(dst);
 }
 
 static int hdmi_read_edid(struct omap_dss_device *dssdev,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d5860438ddd9..889c31745492 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -438,15 +438,9 @@ static int hdmi_connect(struct omap_dss_device *src,
 {
int r;
 
-   r = dss_mgr_connect(dst);
-   if (r)
-   return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
-   if (r) {
-   dss_mgr_disconnect(dst);
+   if (r)
return r;
-   }
 
dst->dispc_channel_connected = true;
return 0;
@@ -458,8 +452,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
 
omapdss_device_disconnect(dst, dst->next);
-
-   dss_mgr_disconnect(dst);
 }
 
 static int hdmi_read_edid(struct omap_dss_device *dssdev,
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index bb340a08c44a..882a2f8f7ac5 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -550,13 +550,6 @@ enum dss_writeback_channel {
 };
 
 struct dss_mgr_ops {
-   int (*connect)(struct omap_drm_private *priv,
-  enum omap_channel channel,
-  struct omap_dss_device *dst);
-   void (*disconnect)(struct omap_drm_private *priv,
-  enum omap_channel channel,
-  struct omap_dss_device *dst);
-
void (*start_update)(struct omap_drm_private *priv,
  

[PATCH v2 48/60] drm/omap: Remove unneeded variable assignments in omap_modeset_init

[Laurent Pinchart]

The crtc_idx and plane_idw variables in the main loop are always equal
to the loop counter i, use it instead. Don't unnecessarily initialize
dssdev to NULL.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_drv.c | 18 +-
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 9b33859e9ac6..0d4c3e2db058 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -239,10 +239,9 @@ static int omap_modeset_init_properties(struct drm_device 
*dev)
 static int omap_modeset_init(struct drm_device *dev)
 {
struct omap_drm_private *priv = dev->dev_private;
-   struct omap_dss_device *dssdev = NULL;
int num_ovls = priv->dispc_ops->get_num_ovls(priv->dispc);
int num_mgrs = priv->dispc_ops->get_num_mgrs(priv->dispc);
-   int num_crtcs, crtc_idx, plane_idx;
+   int num_crtcs;
unsigned int i;
int ret;
u32 plane_crtc_mask;
@@ -275,10 +274,6 @@ static int omap_modeset_init(struct drm_device *dev)
/* All planes can be put to any CRTC */
plane_crtc_mask = (1 << num_crtcs) - 1;
 
-   dssdev = NULL;
-
-   crtc_idx = 0;
-   plane_idx = 0;
for (i = 0; i < priv->num_dssdevs; i++) {
struct omap_dss_device *dssdev = priv->dssdevs[i];
struct drm_connector *connector;
@@ -295,7 +290,7 @@ static int omap_modeset_init(struct drm_device *dev)
if (!connector)
return -ENOMEM;
 
-   plane = omap_plane_init(dev, plane_idx, DRM_PLANE_TYPE_PRIMARY,
+   plane = omap_plane_init(dev, i, DRM_PLANE_TYPE_PRIMARY,
plane_crtc_mask);
if (IS_ERR(plane))
return PTR_ERR(plane);
@@ -305,27 +300,24 @@ static int omap_modeset_init(struct drm_device *dev)
return PTR_ERR(crtc);
 
drm_mode_connector_attach_encoder(connector, encoder);
-   encoder->possible_crtcs = (1 << crtc_idx);
+   encoder->possible_crtcs = 1 << i;
 
priv->crtcs[priv->num_crtcs++] = crtc;
priv->planes[priv->num_planes++] = plane;
priv->encoders[priv->num_encoders++] = encoder;
priv->connectors[priv->num_connectors++] = connector;
-
-   plane_idx++;
-   crtc_idx++;
}
 
/*
 * Create normal planes for the remaining overlays:
 */
-   for (; plane_idx < num_ovls; plane_idx++) {
+   for (; i < num_ovls; i++) {
struct drm_plane *plane;
 
if (WARN_ON(priv->num_planes >= ARRAY_SIZE(priv->planes)))
return -EINVAL;
 
-   plane = omap_plane_init(dev, plane_idx, DRM_PLANE_TYPE_OVERLAY,
+   plane = omap_plane_init(dev, i, DRM_PLANE_TYPE_OVERLAY,
plane_crtc_mask);
if (IS_ERR(plane))
return PTR_ERR(plane);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 54/60] drm/omap: dss: Merge two disconnection helpers

[Laurent Pinchart]

To simplify the pipeline disconnection handling merge the
omapdss_device_disconnect() and omapdss_output_unset_device() functions.
The device state check is now called for every device in the pipeline,
extending this sanity check coverage.

There is no need to return an error from omapdss_device_disconnect()
when the check fails, as omapdss_output_unset_device() used to do, given
that we can't prevent disconnection due to device unbinding (the return
value of omapdss_output_unset_device() is never checked in the current
code for that reason).

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c|  2 ++
 drivers/gpu/drm/omapdrm/dss/dpi.c |  1 -
 drivers/gpu/drm/omapdrm/dss/dsi.c |  1 -
 drivers/gpu/drm/omapdrm/dss/hdmi4.c   |  1 -
 drivers/gpu/drm/omapdrm/dss/hdmi5.c   |  1 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  1 -
 drivers/gpu/drm/omapdrm/dss/output.c  | 21 -
 drivers/gpu/drm/omapdrm/dss/sdi.c |  1 -
 drivers/gpu/drm/omapdrm/dss/venc.c|  1 -
 9 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 3afb3d574a7b..fbb600d49ad2 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -236,6 +236,8 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
src->dst = NULL;
}
 
+   WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED);
+
if (dst->driver)
dst->driver->disconnect(src, dst);
else
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 831de09770a3..4cf397c9300e 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -633,7 +633,6 @@ static void dpi_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
omapdss_device_disconnect(dst, dst->next);
-   omapdss_output_unset_device(dst);
 
dss_mgr_disconnect(dst);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 53a32e20c3bd..bc470baa4f5c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4903,7 +4903,6 @@ static void dsi_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
omapdss_device_disconnect(dst, dst->next);
-   omapdss_output_unset_device(dst);
 
dss_mgr_disconnect(dst);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 22f8b74f5bf5..6616530d5fe6 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -450,7 +450,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
 {
omapdss_device_disconnect(dst, dst->next);
-   omapdss_output_unset_device(dst);
 
dss_mgr_disconnect(dst);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d8592d02a58d..f7e15edc05fc 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -455,7 +455,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
struct omap_dss_device *dst)
 {
omapdss_device_disconnect(dst, dst->next);
-   omapdss_output_unset_device(dst);
 
dss_mgr_disconnect(dst);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 7add73a5479a..672761b5b017 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -518,7 +518,6 @@ int omap_dss_get_num_overlays(void);
 #define for_each_dss_output(d) \
while ((d = omapdss_device_get_next(d, false, true)) != NULL)
 int omapdss_output_validate(struct omap_dss_device *out);
-int omapdss_output_unset_device(struct omap_dss_device *out);
 
 typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
 int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index be544dd48bf4..2da480be918d 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -24,8 +24,6 @@
 #include "dss.h"
 #include "omapdss.h"
 
-static DEFINE_MUTEX(output_lock);
-
 int omapdss_output_validate(struct omap_dss_device *out)
 {
if (out->next && out->output_type != out->next->type) {
@@ -37,25 +35,6 @@ int omapdss_output_validate(struct omap_dss_device *out)
 }
 EXPORT_SYMBOL(omapdss_output_validate);
 
-int omapdss_output_unset_device(struct omap_dss_device *out)
-{
-   int r = 0;
-
-   mutex_lock(_lock);
-
-   if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
-   dev_err(out->dev,
-   "device %s is not disabled, cannot unset device\n",
-   

[PATCH v2 11/60] drm/omap: dss: Constify omap_dss_driver operations structure

[Laurent Pinchart]

The structure contains function pointers that don't need to be modified.
Make all its instances const to improve security.

Signed-off-by: Laurent Pinchart 
---
 drivers/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-dpi.c| 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c  | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h   | 2 +-
 drivers/gpu/drm/omapdrm/omap_connector.c| 6 +++---
 drivers/gpu/drm/omapdrm/omap_encoder.c  | 6 +++---
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 5fdecc12b608..a49bc4a8dcae 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -154,7 +154,7 @@ static int tvc_check_timings(struct omap_dss_device *dssdev,
return in->ops.atv->check_timings(in, vm);
 }
 
-static struct omap_dss_driver tvc_driver = {
+static const struct omap_dss_driver tvc_driver = {
.connect= tvc_connect,
.disconnect = tvc_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 6d8cbd9e2110..c320f3c5ae6c 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -297,7 +297,7 @@ static void dvic_disable_hpd(struct omap_dss_device *dssdev)
mutex_unlock(>hpd_lock);
 }
 
-static struct omap_dss_driver dvic_driver = {
+static const struct omap_dss_driver dvic_driver = {
.connect= dvic_connect,
.disconnect = dvic_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index ca30ed9da7eb..6f12f9bb8054 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -269,7 +269,7 @@ static int hdmic_set_infoframe(struct omap_dss_device 
*dssdev,
return in->ops.hdmi->set_infoframe(in, avi);
 }
 
-static struct omap_dss_driver hdmic_driver = {
+static const struct omap_dss_driver hdmic_driver = {
.connect= hdmic_connect,
.disconnect = hdmic_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 6cbf570d6727..e874f0b72798 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -153,7 +153,7 @@ static int panel_dpi_check_timings(struct omap_dss_device 
*dssdev,
return in->ops.dpi->check_timings(in, vm);
 }
 
-static struct omap_dss_driver panel_dpi_ops = {
+static const struct omap_dss_driver panel_dpi_ops = {
.connect= panel_dpi_connect,
.disconnect = panel_dpi_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 428de90fced1..d7c57d84d7bd 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1210,7 +1210,7 @@ static void dsicm_get_size(struct omap_dss_device *dssdev,
*height = ddata->height_mm;
 }
 
-static struct omap_dss_driver dsicm_ops = {
+static const struct omap_dss_driver dsicm_ops = {
.connect= dsicm_connect,
.disconnect = dsicm_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c 
b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 754197099440..ad98d2ffcf1b 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -228,7 +228,7 @@ static int lb035q02_check_timings(struct omap_dss_device 
*dssdev,
return in->ops.dpi->check_timings(in, vm);
 }
 
-static struct omap_dss_driver lb035q02_ops = {
+static const struct omap_dss_driver lb035q02_ops = {
.connect= lb035q02_connect,
.disconnect = lb035q02_disconnect,
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c 
b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 9a3b27fa5cb5..0846fb594352 100644
--- 

[PATCH v2 34/60] drm/omap: dss: Modify omapdss_find_output_from_display() to return channel

[Laurent Pinchart]

The omapdss_find_output_from_display() function is only used to retrieve
the dispc channel corresponding to the display. Return the dispc channel
directly, and rename the function to omapdss_device_get_dispc_channel()
to match its new purpose.

The dssdev->id check is removed as the dssdev is guaranteed to be an
output and have a non-zero id, as proved by the lack of crash despite
the caller never checking the returned pointer before dereferencing it.

As the function is not specific to outputs anymore, move it from
output.c to base.c.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c|  9 +
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  3 +--
 drivers/gpu/drm/omapdrm/dss/output.c  | 12 
 drivers/gpu/drm/omapdrm/omap_crtc.c   |  5 +
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index b4bc58c5134d..7f9d8a8be8c3 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -236,6 +236,15 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
 }
 EXPORT_SYMBOL_GPL(omapdss_device_disconnect);
 
+enum omap_channel omapdss_device_get_dispc_channel(struct omap_dss_device 
*dssdev)
+{
+   while (dssdev->src)
+   dssdev = dssdev->src;
+
+   return dssdev->dispc_channel;
+}
+EXPORT_SYMBOL(omapdss_device_get_dispc_channel);
+
 /* 
-
  * Components Handling
  */
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 4df405ae20db..121bc953ba31 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -504,6 +504,7 @@ int omapdss_device_connect(struct dss_device *dss,
   struct omap_dss_device *dst);
 void omapdss_device_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst);
+enum omap_channel omapdss_device_get_dispc_channel(struct omap_dss_device 
*dssdev);
 
 int omap_dss_get_num_overlay_managers(void);
 
@@ -513,8 +514,6 @@ int omapdss_output_set_device(struct omap_dss_device *out,
struct omap_dss_device *dssdev);
 int omapdss_output_unset_device(struct omap_dss_device *out);
 
-struct omap_dss_device *omapdss_find_output_from_display(struct 
omap_dss_device *dssdev);
-
 typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
 int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
 int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index a5df6eed4aef..191b2e801257 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -88,18 +88,6 @@ int omapdss_output_unset_device(struct omap_dss_device *out)
 }
 EXPORT_SYMBOL(omapdss_output_unset_device);
 
-struct omap_dss_device *omapdss_find_output_from_display(struct 
omap_dss_device *dssdev)
-{
-   while (dssdev->src)
-   dssdev = dssdev->src;
-
-   if (dssdev->id != 0)
-   return omapdss_device_get(dssdev);
-
-   return NULL;
-}
-EXPORT_SYMBOL(omapdss_find_output_from_display);
-
 int dss_install_mgr_ops(struct dss_device *dss,
const struct dss_mgr_ops *mgr_ops,
struct omap_drm_private *priv)
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 4ddc4ed18b47..c5f1915aef67 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -699,12 +699,9 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
struct drm_crtc *crtc = NULL;
struct omap_crtc *omap_crtc;
enum omap_channel channel;
-   struct omap_dss_device *out;
int ret;
 
-   out = omapdss_find_output_from_display(dssdev);
-   channel = out->dispc_channel;
-   omapdss_device_put(out);
+   channel = omapdss_device_get_dispc_channel(dssdev);
 
DBG("%s", channel_names[channel]);
 
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 50/60] drm/omap: Group CRTC, encoder, connector and dssdev in a structure

[Laurent Pinchart]

Create an omap_drm_pipeline structure to model display pipelines, made
of a CRTC, an encoder, a connector and a DSS display device. This allows
grouping related parameters together instead of storing them in
independent arrays and thus improves code readability.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_crtc.c  |   4 +-
 drivers/gpu/drm/omapdrm/omap_drv.c   | 144 +--
 drivers/gpu/drm/omapdrm/omap_drv.h   |  20 +++--
 drivers/gpu/drm/omapdrm/omap_fbdev.c |   4 +-
 drivers/gpu/drm/omapdrm/omap_irq.c   |   4 +-
 5 files changed, 84 insertions(+), 92 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index c5f1915aef67..f5bf553a862f 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -474,8 +474,8 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
 * has been changed to the DRM model.
 */
 
-   for (i = 0; i < priv->num_encoders; ++i) {
-   struct drm_encoder *encoder = priv->encoders[i];
+   for (i = 0; i < priv->num_pipes; ++i) {
+   struct drm_encoder *encoder = priv->pipes[i].encoder;
 
if (encoder->crtc == crtc) {
struct omap_dss_device *dssdev;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 99ed47a17ce3..298d594a0c65 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -129,9 +129,9 @@ static const struct drm_mode_config_funcs 
omap_mode_config_funcs = {
.atomic_commit = drm_atomic_helper_commit,
 };
 
-static int get_connector_type(struct omap_dss_device *dssdev)
+static int get_connector_type(struct omap_dss_device *display)
 {
-   switch (dssdev->type) {
+   switch (display->type) {
case OMAP_DISPLAY_TYPE_HDMI:
return DRM_MODE_CONNECTOR_HDMIA;
case OMAP_DISPLAY_TYPE_DVI:
@@ -151,65 +151,65 @@ static int get_connector_type(struct omap_dss_device 
*dssdev)
}
 }
 
-static void omap_disconnect_dssdevs(struct drm_device *ddev)
+static void omap_disconnect_pipelines(struct drm_device *ddev)
 {
struct omap_drm_private *priv = ddev->dev_private;
unsigned int i;
 
-   for (i = 0; i < priv->num_dssdevs; i++) {
-   struct omap_dss_device *dssdev = priv->dssdevs[i];
+   for (i = 0; i < priv->num_pipes; i++) {
+   struct omap_dss_device *display = priv->pipes[i].display;
 
-   omapdss_device_disconnect(dssdev, NULL);
-   priv->dssdevs[i] = NULL;
-   omapdss_device_put(dssdev);
+   omapdss_device_disconnect(display, NULL);
+   priv->pipes[i].display = NULL;
+   omapdss_device_put(display);
}
 
-   priv->num_dssdevs = 0;
+   priv->num_pipes = 0;
 }
 
-static int omap_compare_dssdevs(const void *a, const void *b)
+static int omap_compare_pipes(const void *a, const void *b)
 {
-   const struct omap_dss_device *dssdev1 = *(struct omap_dss_device **)a;
-   const struct omap_dss_device *dssdev2 = *(struct omap_dss_device **)b;
+   const struct omap_drm_pipeline *pipe1 = a;
+   const struct omap_drm_pipeline *pipe2 = b;
 
-   if (dssdev1->alias_id > dssdev2->alias_id)
+   if (pipe1->display->alias_id > pipe2->display->alias_id)
return 1;
-   else if (dssdev1->alias_id < dssdev2->alias_id)
+   else if (pipe1->display->alias_id < pipe2->display->alias_id)
return -1;
return 0;
 }
 
-static int omap_connect_dssdevs(struct drm_device *ddev)
+static int omap_connect_pipelines(struct drm_device *ddev)
 {
struct omap_drm_private *priv = ddev->dev_private;
-   struct omap_dss_device *dssdev = NULL;
+   struct omap_dss_device *display = NULL;
int r;
 
if (!omapdss_stack_is_ready())
return -EPROBE_DEFER;
 
-   for_each_dss_display(dssdev) {
-   r = omapdss_device_connect(priv->dss, dssdev, NULL);
+   for_each_dss_display(display) {
+   r = omapdss_device_connect(priv->dss, display, NULL);
if (r == -EPROBE_DEFER) {
-   omapdss_device_put(dssdev);
+   omapdss_device_put(display);
goto cleanup;
} else if (r) {
-   dev_warn(dssdev->dev, "could not connect display: %s\n",
-   dssdev->name);
+   dev_warn(display->dev, "could not connect display: 
%s\n",
+   display->name);
} else {
-   omapdss_device_get(dssdev);
-   priv->dssdevs[priv->num_dssdevs++] = dssdev;
-   if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
+   omapdss_device_get(display);
+ 

[PATCH v2 56/60] drm/omap: Store CRTC lookup by channel table in omap_drm_private

[Laurent Pinchart]

The omap_crtcs global array is used to store pointers to omap_crtc
indexed by DISPC channel number, in order to look them up in the dss_mgr
operations. Store the information in the omap_drm_private structure in
the form of an array of omap_drm_pipeline pointers.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_crtc.c | 22 +-
 drivers/gpu/drm/omapdrm/omap_drv.c  | 19 +++
 drivers/gpu/drm/omapdrm/omap_drv.h  |  1 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index f5bdb8de98f4..9742d9f49a7c 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -109,7 +109,6 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
  */
 
 /* ovl-mgr-id -> crtc */
-static struct omap_crtc *omap_crtcs[8];
 static struct omap_dss_device *omap_crtc_output[8];
 
 /* we can probably ignore these until we support command-mode panels: */
@@ -215,7 +214,8 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, 
bool enable)
 static int omap_crtc_dss_enable(struct omap_drm_private *priv,
enum omap_channel channel)
 {
-   struct omap_crtc *omap_crtc = omap_crtcs[channel];
+   struct drm_crtc *crtc = priv->channels[channel]->crtc;
+   struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
 
priv->dispc_ops->mgr_set_timings(priv->dispc, omap_crtc->channel,
 _crtc->vm);
@@ -227,7 +227,8 @@ static int omap_crtc_dss_enable(struct omap_drm_private 
*priv,
 static void omap_crtc_dss_disable(struct omap_drm_private *priv,
  enum omap_channel channel)
 {
-   struct omap_crtc *omap_crtc = omap_crtcs[channel];
+   struct drm_crtc *crtc = priv->channels[channel]->crtc;
+   struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
 
omap_crtc_set_enabled(_crtc->base, false);
 }
@@ -236,7 +237,9 @@ static void omap_crtc_dss_set_timings(struct 
omap_drm_private *priv,
enum omap_channel channel,
const struct videomode *vm)
 {
-   struct omap_crtc *omap_crtc = omap_crtcs[channel];
+   struct drm_crtc *crtc = priv->channels[channel]->crtc;
+   struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+
DBG("%s", omap_crtc->name);
omap_crtc->vm = *vm;
 }
@@ -245,7 +248,8 @@ static void omap_crtc_dss_set_lcd_config(struct 
omap_drm_private *priv,
enum omap_channel channel,
const struct dss_lcd_mgr_config *config)
 {
-   struct omap_crtc *omap_crtc = omap_crtcs[channel];
+   struct drm_crtc *crtc = priv->channels[channel]->crtc;
+   struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
 
DBG("%s", omap_crtc->name);
priv->dispc_ops->mgr_set_lcd_config(priv->dispc, omap_crtc->channel,
@@ -681,8 +685,6 @@ static const char *channel_names[] = {
 
 void omap_crtc_pre_init(struct omap_drm_private *priv)
 {
-   memset(omap_crtcs, 0, sizeof(omap_crtcs));
-
dss_install_mgr_ops(priv->dss, _ops, priv);
 }
 
@@ -706,10 +708,6 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
DBG("%s", channel_names[channel]);
 
-   /* Multiple displays on same channel is not allowed */
-   if (WARN_ON(omap_crtcs[channel] != NULL))
-   return ERR_PTR(-EINVAL);
-
omap_crtc = kzalloc(sizeof(*omap_crtc), GFP_KERNEL);
if (!omap_crtc)
return ERR_PTR(-ENOMEM);
@@ -748,7 +746,5 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
omap_plane_install_properties(crtc->primary, >base);
 
-   omap_crtcs[channel] = omap_crtc;
-
return crtc;
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 6bc826515684..c3c657d90029 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -167,6 +167,8 @@ static void omap_disconnect_pipelines(struct drm_device 
*ddev)
pipe->display = NULL;
}
 
+   memset(>channels, 0, sizeof(priv->channels));
+
priv->num_pipes = 0;
 }
 
@@ -186,6 +188,7 @@ static int omap_connect_pipelines(struct drm_device *ddev)
 {
struct omap_drm_private *priv = ddev->dev_private;
struct omap_dss_device *output = NULL;
+   unsigned int i;
int r;
 
if (!omapdss_stack_is_ready())
@@ -218,6 +221,22 @@ static int omap_connect_pipelines(struct drm_device *ddev)
sort(priv->pipes, priv->num_pipes, sizeof(priv->pipes[0]),
 omap_compare_pipes, NULL);
 
+   /*
+* Populate the pipeline lookup table by DISPC channel. Only one display
+* is allowed per channel.
+*/
+   for (i = 0; i < priv->num_pipes; ++i) {
+   struct omap_drm_pipeline *pipe = >pipes[i];
+   enum omap_channel channel = pipe->output->dispc_channel;
+
+ 

[PATCH v2 46/60] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()

[Laurent Pinchart]

The dss_mgr_connect() and dss_mgr_disconnect() functions take two
omap_dss_device pointers as parameters, which are always set to the same
value by all callers. Remove the duplicated pointer.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +++-
 drivers/gpu/drm/omapdrm/dss/dsi.c | 8 +++-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c   | 8 +++-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c   | 8 +++-
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 6 ++
 drivers/gpu/drm/omapdrm/dss/output.c  | 9 -
 drivers/gpu/drm/omapdrm/dss/sdi.c | 8 +++-
 drivers/gpu/drm/omapdrm/dss/venc.c| 8 +++-
 8 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 650becdf2763..68c8424a460d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -652,7 +652,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
 
dpi_init_pll(dpi);
 
-   r = dss_mgr_connect(>output, dssdev);
+   r = dss_mgr_connect(dssdev);
if (r)
return r;
 
@@ -660,7 +660,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
return r;
}
 
@@ -670,11 +670,9 @@ static int dpi_connect(struct omap_dss_device *dssdev,
 static void dpi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
 {
-   struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
-
omapdss_output_unset_device(dssdev);
 
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
 }
 
 static const struct omap_dss_device_ops dpi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index b48ee792244b..2c2570e1ef2f 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4915,7 +4915,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
 
-   r = dss_mgr_connect(>output, dssdev);
+   r = dss_mgr_connect(dssdev);
if (r)
return r;
 
@@ -4923,7 +4923,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dssdev->name);
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
return r;
}
 
@@ -4933,11 +4933,9 @@ static int dsi_connect(struct omap_dss_device *dssdev,
 static void dsi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
 {
-   struct dsi_data *dsi = to_dsi_data(dssdev);
-
omapdss_output_unset_device(dssdev);
 
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
 }
 
 static const struct omap_dss_device_ops dsi_ops = {
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 118c015624b9..5216c5554741 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -458,7 +458,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
 
-   r = dss_mgr_connect(>output, dssdev);
+   r = dss_mgr_connect(dssdev);
if (r)
return r;
 
@@ -466,7 +466,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to connect output to new device: %s\n",
dst->name);
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
return r;
}
 
@@ -476,11 +476,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
 static void hdmi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
 {
-   struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
omapdss_output_unset_device(dssdev);
 
-   dss_mgr_disconnect(>output, dssdev);
+   dss_mgr_disconnect(dssdev);
 }
 
 static int hdmi_read_edid(struct omap_dss_device *dssdev,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 7af60ca4e7b2..363bc5843e0f 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -461,7 +461,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r)
return r;
 
-   r = dss_mgr_connect(>output, dssdev);
+   r = dss_mgr_connect(dssdev);
if (r)
return r;
 
@@ -469,7 +469,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (r) {
DSSERR("failed to 

[PATCH v2 55/60] drm/omap: Pass pipe pointer to omap_crtc_init()

[Laurent Pinchart]

Replace the dss display device pointer by a pipe pointer that will allow
the omap_crtc_init() function to access both the display and the DSS
output. As a result we can remove the omapdss_device_get_dispc_channel()
function that is now unneeded.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 9 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 -
 drivers/gpu/drm/omapdrm/omap_crtc.c   | 7 ---
 drivers/gpu/drm/omapdrm/omap_crtc.h   | 4 +++-
 drivers/gpu/drm/omapdrm/omap_drv.c| 2 +-
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index fbb600d49ad2..cce09a48d769 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -247,15 +247,6 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
 }
 EXPORT_SYMBOL_GPL(omapdss_device_disconnect);
 
-enum omap_channel omapdss_device_get_dispc_channel(struct omap_dss_device 
*dssdev)
-{
-   while (dssdev->src)
-   dssdev = dssdev->src;
-
-   return dssdev->dispc_channel;
-}
-EXPORT_SYMBOL(omapdss_device_get_dispc_channel);
-
 /* 
-
  * Components Handling
  */
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 672761b5b017..d7084ca36d0e 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -509,7 +509,6 @@ int omapdss_device_connect(struct dss_device *dss,
   struct omap_dss_device *dst);
 void omapdss_device_disconnect(struct omap_dss_device *src,
   struct omap_dss_device *dst);
-enum omap_channel omapdss_device_get_dispc_channel(struct omap_dss_device 
*dssdev);
 
 int omap_dss_get_num_overlay_managers(void);
 
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c 
b/drivers/gpu/drm/omapdrm/omap_crtc.c
index f5bf553a862f..f5bdb8de98f4 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -693,7 +693,8 @@ void omap_crtc_pre_uninit(struct omap_drm_private *priv)
 
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
-   struct drm_plane *plane, struct omap_dss_device *dssdev)
+   struct omap_drm_pipeline *pipe,
+   struct drm_plane *plane)
 {
struct omap_drm_private *priv = dev->dev_private;
struct drm_crtc *crtc = NULL;
@@ -701,7 +702,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
enum omap_channel channel;
int ret;
 
-   channel = omapdss_device_get_dispc_channel(dssdev);
+   channel = pipe->output->dispc_channel;
 
DBG("%s", channel_names[channel]);
 
@@ -724,7 +725,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
_crtc_funcs, NULL);
if (ret < 0) {
dev_err(dev->dev, "%s(): could not init crtc for: %s\n",
-   __func__, dssdev->name);
+   __func__, pipe->display->name);
kfree(omap_crtc);
return ERR_PTR(ret);
}
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.h 
b/drivers/gpu/drm/omapdrm/omap_crtc.h
index 1c6530703855..d9de437ba9dd 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.h
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.h
@@ -27,6 +27,7 @@ enum omap_channel;
 struct drm_crtc;
 struct drm_device;
 struct drm_plane;
+struct omap_drm_pipeline;
 struct omap_dss_device;
 struct videomode;
 
@@ -35,7 +36,8 @@ enum omap_channel omap_crtc_channel(struct drm_crtc *crtc);
 void omap_crtc_pre_init(struct omap_drm_private *priv);
 void omap_crtc_pre_uninit(struct omap_drm_private *priv);
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
-   struct drm_plane *plane, struct omap_dss_device *dssdev);
+   struct omap_drm_pipeline *pipe,
+   struct drm_plane *plane);
 int omap_crtc_wait_pending(struct drm_crtc *crtc);
 void omap_crtc_error_irq(struct drm_crtc *crtc, u32 irqstatus);
 void omap_crtc_vblank_irq(struct drm_crtc *crtc);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index dc2f059f8f4d..6bc826515684 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -308,7 +308,7 @@ static int omap_modeset_init(struct drm_device *dev)
if (!connector)
return -ENOMEM;
 
-   crtc = omap_crtc_init(dev, priv->planes[i], display);
+   crtc = omap_crtc_init(dev, pipe, priv->planes[i]);
if (IS_ERR(crtc))
return PTR_ERR(crtc);
 
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org

[PATCH v2 51/60] drm/omap: Reverse direction of DSS device (dis)connect operations

[Laurent Pinchart]

The omapdrm and omapdss drivers are architectured based on display
pipelines made of multiple components handled from sink (display) to
source (DSS output). This is incompatible with the DRM bridge and panel
APIs that handle components from source to sink.

To reconcile the omapdrm and omapdss drivers with the DRM bridge and
panel model, we need to reverse the direction of the DSS device
operations. Start with the connect and disconnect operations.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 27 +++---
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   | 27 +++---
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  | 27 +++---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  | 34 --
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  | 34 --
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   | 32 ++---
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   | 27 +++---
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c| 42 ++
 .../omapdrm/displays/panel-lgphilips-lb035q02.c| 28 +++
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c| 27 +++---
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 27 +++---
 .../drm/omapdrm/displays/panel-sony-acx565akm.c| 27 +++---
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c| 27 +++---
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c| 27 +++---
 drivers/gpu/drm/omapdrm/dss/base.c | 30 
 drivers/gpu/drm/omapdrm/dss/dpi.c  | 32 +++--
 drivers/gpu/drm/omapdrm/dss/dsi.c  | 32 +++--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c| 30 ++--
 drivers/gpu/drm/omapdrm/dss/hdmi5.c| 30 ++--
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  6 ++--
 drivers/gpu/drm/omapdrm/dss/sdi.c  | 30 ++--
 drivers/gpu/drm/omapdrm/dss/venc.c | 30 ++--
 drivers/gpu/drm/omapdrm/omap_drv.c | 35 ++
 drivers/gpu/drm/omapdrm/omap_drv.h |  1 +
 24 files changed, 238 insertions(+), 431 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index eab898b5bf0f..d59b4f2e22dc 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -41,33 +41,15 @@ static const struct videomode tvc_pal_vm = {
 
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
 
-static int tvc_connect(struct omap_dss_device *dssdev)
+static int tvc_connect(struct omap_dss_device *src,
+  struct omap_dss_device *dst)
 {
-   struct omap_dss_device *src;
-   int r;
-
-   src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
-   if (IS_ERR_OR_NULL(src)) {
-   dev_err(dssdev->dev, "failed to find video source\n");
-   return src ? PTR_ERR(src) : -EINVAL;
-   }
-
-   r = omapdss_device_connect(dssdev->dss, src, dssdev);
-   if (r) {
-   omapdss_device_put(src);
-   return r;
-   }
-
return 0;
 }
 
-static void tvc_disconnect(struct omap_dss_device *dssdev)
+static void tvc_disconnect(struct omap_dss_device *src,
+  struct omap_dss_device *dst)
 {
-   struct omap_dss_device *src = dssdev->src;
-
-   omapdss_device_disconnect(src, dssdev);
-
-   omapdss_device_put(src);
 }
 
 static int tvc_enable(struct omap_dss_device *dssdev)
@@ -184,7 +166,6 @@ static int __exit tvc_remove(struct platform_device *pdev)
omapdss_device_unregister(>dssdev);
 
tvc_disable(dssdev);
-   tvc_disconnect(dssdev);
 
return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 6eae18b42b82..39e7d0be887f 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -56,33 +56,15 @@ struct panel_drv_data {
 
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
 
-static int dvic_connect(struct omap_dss_device *dssdev)
+static int dvic_connect(struct omap_dss_device *src,
+   struct omap_dss_device *dst)
 {
-   struct omap_dss_device *src;
-   int r;
-
-   src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
-   if (IS_ERR_OR_NULL(src)) {
-   dev_err(dssdev->dev, "failed to find video source\n");
-   return src ? PTR_ERR(src) : -EINVAL;
-   }
-
-   r = omapdss_device_connect(dssdev->dss, src, dssdev);
-   if (r) {
-   omapdss_device_put(src);
-   return r;
-   }
-

[PATCH v2 52/60] drm/omap: dss: Move connection checks to omapdss_device_(dis)connect

[Laurent Pinchart]

When a DSS output is (dis)connected the omapdss_output_(un)set_device()
function performs a sanity check to ensure that the output isn't already
(dis)connected. The check is unnecessary as those situations should
never happen, but can nonetheless be useful to catch driver bugs. To
prepare for removal of the omapdss_output_(un)set_device() functions
move the connection check to the omapdss_device_connect() function. The
omapdss_device_disconnect() already contains a corresponding check.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c   |  1 +
 drivers/gpu/drm/omapdrm/dss/output.c | 29 ++---
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 7f41c541397b..3afb3d574a7b 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -209,6 +209,7 @@ int omapdss_device_connect(struct dss_device *dss,
}
 
if (src) {
+   WARN_ON(src->dst);
dst->src = src;
src->dst = dst;
}
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 2f7a019d059e..96d74218cf91 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -29,61 +29,36 @@ static DEFINE_MUTEX(output_lock);
 int omapdss_output_set_device(struct omap_dss_device *out,
struct omap_dss_device *dssdev)
 {
-   int r;
+   int r = 0;
 
mutex_lock(_lock);
 
-   if (out->dst) {
-   dev_err(out->dev,
-   "output already has device %s connected to it\n",
-   out->dst->name);
-   r = -EINVAL;
-   goto err;
-   }
-
if (out->output_type != dssdev->type) {
dev_err(out->dev, "output type and display type don't match\n");
r = -EINVAL;
-   goto err;
}
 
mutex_unlock(_lock);
 
-   return 0;
-err:
-   mutex_unlock(_lock);
-
return r;
 }
 EXPORT_SYMBOL(omapdss_output_set_device);
 
 int omapdss_output_unset_device(struct omap_dss_device *out)
 {
-   int r;
+   int r = 0;
 
mutex_lock(_lock);
 
-   if (!out->dst) {
-   dev_err(out->dev,
-   "output doesn't have a device connected to it\n");
-   r = -EINVAL;
-   goto err;
-   }
-
if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
dev_err(out->dev,
"device %s is not disabled, cannot unset device\n",
out->dst->name);
r = -EINVAL;
-   goto err;
}
 
mutex_unlock(_lock);
 
-   return 0;
-err:
-   mutex_unlock(_lock);
-
return r;
 }
 EXPORT_SYMBOL(omapdss_output_unset_device);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 42/60] drm/omap: dss: venc: Move initialization code from bind to probe

[Laurent Pinchart]

There's no reason to delay initialization of most of the driver (such as
mapping memory I/O or enabling runtime PM) to the component bind
handler. Perform as much of the initialization as possible at probe
time, initializing at bind time only the parts that depends on the DSS.
The cleanup code is moved from unbind to remove in a similar way.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/venc.c | 104 +
 1 file changed, 60 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c 
b/drivers/gpu/drm/omapdrm/dss/venc.c
index c8fb91bb1ad3..84069e79ca6a 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -756,6 +756,50 @@ static const struct omap_dss_device_ops venc_ops = {
.set_timings = venc_set_timings,
 };
 
+/* 
-
+ * Component Bind & Unbind
+ */
+
+static int venc_bind(struct device *dev, struct device *master, void *data)
+{
+   struct dss_device *dss = dss_get_device(master);
+   struct venc_device *venc = dev_get_drvdata(dev);
+   u8 rev_id;
+   int r;
+
+   venc->dss = dss;
+
+   r = venc_runtime_get(venc);
+   if (r)
+   return r;
+
+   rev_id = (u8)(venc_read_reg(venc, VENC_REV_ID) & 0xff);
+   dev_dbg(dev, "OMAP VENC rev %d\n", rev_id);
+
+   venc_runtime_put(venc);
+
+   venc->debugfs = dss_debugfs_create_file(dss, "venc", venc_dump_regs,
+   venc);
+
+   return 0;
+}
+
+static void venc_unbind(struct device *dev, struct device *master, void *data)
+{
+   struct venc_device *venc = dev_get_drvdata(dev);
+
+   dss_debugfs_remove_file(venc->debugfs);
+}
+
+static const struct component_ops venc_component_ops = {
+   .bind   = venc_bind,
+   .unbind = venc_unbind,
+};
+
+/* 
-
+ * Probe & Remove, Suspend & Resume
+ */
+
 static void venc_init_output(struct venc_device *venc)
 {
struct omap_dss_device *out = >output;
@@ -820,19 +864,15 @@ static int venc_probe_of(struct venc_device *venc)
return r;
 }
 
-/* VENC HW IP initialisation */
 static const struct soc_device_attribute venc_soc_devices[] = {
{ .machine = "OMAP3[45]*" },
{ .machine = "AM35*" },
{ /* sentinel */ }
 };
 
-static int venc_bind(struct device *dev, struct device *master, void *data)
+static int venc_probe(struct platform_device *pdev)
 {
-   struct platform_device *pdev = to_platform_device(dev);
-   struct dss_device *dss = dss_get_device(master);
struct venc_device *venc;
-   u8 rev_id;
struct resource *venc_mem;
int r;
 
@@ -841,8 +881,8 @@ static int venc_bind(struct device *dev, struct device 
*master, void *data)
return -ENOMEM;
 
venc->pdev = pdev;
-   venc->dss = dss;
-   dev_set_drvdata(dev, venc);
+
+   platform_set_drvdata(pdev, venc);
 
/* The OMAP34xx, OMAP35xx and AM35xx VENC require the TV DAC clock. */
if (soc_device_match(venc_soc_devices))
@@ -863,63 +903,39 @@ static int venc_bind(struct device *dev, struct device 
*master, void *data)
if (r)
goto err_free;
 
-   pm_runtime_enable(>dev);
-
-   r = venc_runtime_get(venc);
-   if (r)
-   goto err_pm_disable;
-
-   rev_id = (u8)(venc_read_reg(venc, VENC_REV_ID) & 0xff);
-   dev_dbg(>dev, "OMAP VENC rev %d\n", rev_id);
-
-   venc_runtime_put(venc);
-
r = venc_probe_of(venc);
-   if (r) {
-   DSSERR("Invalid DT data\n");
-   goto err_pm_disable;
-   }
+   if (r)
+   goto err_free;
 
-   venc->debugfs = dss_debugfs_create_file(dss, "venc", venc_dump_regs,
-   venc);
+   pm_runtime_enable(>dev);
 
venc_init_output(venc);
 
+   r = component_add(>dev, _component_ops);
+   if (r)
+   goto err_uninit_output;
+
return 0;
 
-err_pm_disable:
+err_uninit_output:
+   venc_uninit_output(venc);
pm_runtime_disable(>dev);
 err_free:
kfree(venc);
return r;
 }
 
-static void venc_unbind(struct device *dev, struct device *master, void *data)
+static int venc_remove(struct platform_device *pdev)
 {
-   struct venc_device *venc = dev_get_drvdata(dev);
+   struct venc_device *venc = platform_get_drvdata(pdev);
 
-   dss_debugfs_remove_file(venc->debugfs);
+   component_del(>dev, _component_ops);
 
venc_uninit_output(venc);
 
-   pm_runtime_disable(dev);
+   pm_runtime_disable(>dev);
 
kfree(venc);
-}
-
-static const struct component_ops venc_component_ops = {
-   .bind   = venc_bind,
-   .unbind = venc_unbind,
-};
-
-static int venc_probe(struct platform_device 

[PATCH v2 45/60] drm/omap: dss: Add function to retrieve display for an output

[Laurent Pinchart]

Add a new omapdss_display_get() function to retrieve the omap_dss_device
for a given DSS output. This will be used when reversing the direction
of the DSS pipeline handling logic.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/display.c | 9 +
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index 65ca71859c7d..697dab0435d6 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -49,3 +49,12 @@ void omapdss_display_init(struct omap_dss_device *dssdev)
  "display%u", id);
 }
 EXPORT_SYMBOL_GPL(omapdss_display_init);
+
+struct omap_dss_device *omapdss_display_get(struct omap_dss_device *output)
+{
+   while (output->next)
+   output = output->next;
+
+   return omapdss_device_get(output);
+}
+EXPORT_SYMBOL_GPL(omapdss_display_get);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 723124f6e596..1d7263fc6077 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -491,6 +491,7 @@ static inline bool omapdss_is_initialized(void)
 #define for_each_dss_display(d) \
while ((d = omapdss_device_get_next(d, true, false)) != NULL)
 void omapdss_display_init(struct omap_dss_device *dssdev);
+struct omap_dss_device *omapdss_display_get(struct omap_dss_device *output);
 
 void omapdss_device_register(struct omap_dss_device *dssdev);
 void omapdss_device_unregister(struct omap_dss_device *dssdev);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 47/60] drm/omap: dss: Get regulators at probe time

[Laurent Pinchart]

Regulators for the DPI, DSI, HDMI, SDI and VENC outputs are all looked
up when connecting the output omap_dss_device. There's no need to delay
regulator handling to that time, get the regulators at probe time.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c   | 69 ++---
 drivers/gpu/drm/omapdrm/dss/dsi.c   | 36 ---
 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 33 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 31 +
 drivers/gpu/drm/omapdrm/dss/sdi.c   | 32 +
 drivers/gpu/drm/omapdrm/dss/venc.c  | 32 +
 6 files changed, 72 insertions(+), 161 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 68c8424a460d..4557357e4130 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -551,38 +551,6 @@ static int dpi_verify_pll(struct dss_pll *pll)
return 0;
 }
 
-static const struct soc_device_attribute dpi_soc_devices[] = {
-   { .machine = "OMAP3[456]*" },
-   { .machine = "[AD]M37*" },
-   { /* sentinel */ }
-};
-
-static int dpi_init_regulator(struct dpi_data *dpi)
-{
-   struct regulator *vdds_dsi;
-
-   /*
-* The DPI uses the DSI VDDS on OMAP34xx, OMAP35xx, OMAP36xx, AM37xx and
-* DM37xx only.
-*/
-   if (!soc_device_match(dpi_soc_devices))
-   return 0;
-
-   if (dpi->vdds_dsi_reg)
-   return 0;
-
-   vdds_dsi = devm_regulator_get(>pdev->dev, "vdds_dsi");
-   if (IS_ERR(vdds_dsi)) {
-   if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
-   DSSERR("can't get VDDS_DSI regulator\n");
-   return PTR_ERR(vdds_dsi);
-   }
-
-   dpi->vdds_dsi_reg = vdds_dsi;
-
-   return 0;
-}
-
 static void dpi_init_pll(struct dpi_data *dpi)
 {
struct dss_pll *pll;
@@ -646,10 +614,6 @@ static int dpi_connect(struct omap_dss_device *dssdev,
struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
int r;
 
-   r = dpi_init_regulator(dpi);
-   if (r)
-   return r;
-
dpi_init_pll(dpi);
 
r = dss_mgr_connect(dssdev);
@@ -737,6 +701,35 @@ static void dpi_uninit_output_port(struct device_node 
*port)
omapdss_device_unregister(out);
 }
 
+static const struct soc_device_attribute dpi_soc_devices[] = {
+   { .machine = "OMAP3[456]*" },
+   { .machine = "[AD]M37*" },
+   { /* sentinel */ }
+};
+
+static int dpi_init_regulator(struct dpi_data *dpi)
+{
+   struct regulator *vdds_dsi;
+
+   /*
+* The DPI uses the DSI VDDS on OMAP34xx, OMAP35xx, OMAP36xx, AM37xx and
+* DM37xx only.
+*/
+   if (!soc_device_match(dpi_soc_devices))
+   return 0;
+
+   vdds_dsi = devm_regulator_get(>pdev->dev, "vdds_dsi");
+   if (IS_ERR(vdds_dsi)) {
+   if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
+   DSSERR("can't get VDDS_DSI regulator\n");
+   return PTR_ERR(vdds_dsi);
+   }
+
+   dpi->vdds_dsi_reg = vdds_dsi;
+
+   return 0;
+}
+
 int dpi_init_port(struct dss_device *dss, struct platform_device *pdev,
  struct device_node *port, enum dss_model dss_model)
 {
@@ -769,6 +762,10 @@ int dpi_init_port(struct dss_device *dss, struct 
platform_device *pdev,
 
mutex_init(>lock);
 
+   r = dpi_init_regulator(dpi);
+   if (r)
+   return r;
+
return dpi_init_output_port(dpi, port);
 }
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 2c2570e1ef2f..6718c7f04423 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1137,26 +1137,6 @@ static void dsi_runtime_put(struct dsi_data *dsi)
WARN_ON(r < 0 && r != -ENOSYS);
 }
 
-static int dsi_regulator_init(struct dsi_data *dsi)
-{
-   struct regulator *vdds_dsi;
-
-   if (dsi->vdds_dsi_reg != NULL)
-   return 0;
-
-   vdds_dsi = devm_regulator_get(dsi->dev, "vdd");
-
-   if (IS_ERR(vdds_dsi)) {
-   if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
-   DSSERR("can't get DSI VDD regulator\n");
-   return PTR_ERR(vdds_dsi);
-   }
-
-   dsi->vdds_dsi_reg = vdds_dsi;
-
-   return 0;
-}
-
 static void _dsi_print_reset_status(struct dsi_data *dsi)
 {
u32 l;
@@ -1353,10 +1333,6 @@ static int dsi_pll_enable(struct dss_pll *pll)
 
DSSDBG("PLL init\n");
 
-   r = dsi_regulator_init(dsi);
-   if (r)
-   return r;
-
r = dsi_runtime_get(dsi);
if (r)
return r;
@@ -4908,13 +4884,8 @@ static int dsi_get_clocks(struct dsi_data *dsi)
 static int dsi_connect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
 {
-   struct dsi_data *dsi = to_dsi_data(dssdev);
int r;
 
-   r = 

[PATCH v2 43/60] drm/omap: dss: Acquire next dssdev at probe time

[Laurent Pinchart]

Look up the next dssdev at probe time based on device tree links for all
DSS outputs and encoders. This will be used to reverse the order of the
dssdev connect and disconnect call chains.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c|  9 +
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c|  9 +
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c |  9 +
 drivers/gpu/drm/omapdrm/dss/dpi.c| 17 +
 drivers/gpu/drm/omapdrm/dss/dsi.c| 18 --
 drivers/gpu/drm/omapdrm/dss/hdmi4.c  | 18 --
 drivers/gpu/drm/omapdrm/dss/hdmi5.c  | 18 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h|  1 +
 drivers/gpu/drm/omapdrm/dss/sdi.c| 17 +++--
 drivers/gpu/drm/omapdrm/dss/venc.c   | 18 --
 10 files changed, 120 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 904ebec5f5e1..a94d6d0cead9 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -169,6 +169,13 @@ static int opa362_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
dssdev->of_ports = BIT(1) | BIT(0);
 
+   dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
+   if (IS_ERR(dssdev->next)) {
+   if (PTR_ERR(dssdev->next) != -EPROBE_DEFER)
+   dev_err(>dev, "failed to find video sink\n");
+   return PTR_ERR(dssdev->next);
+   }
+
omapdss_device_register(dssdev);
 
return 0;
@@ -179,6 +186,8 @@ static int __exit opa362_remove(struct platform_device 
*pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
+   if (dssdev->next)
+   omapdss_device_put(dssdev->next);
omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index cd442f66fa1d..d40a0fd93e67 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -192,6 +192,13 @@ static int tfp410_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
dssdev->of_ports = BIT(1) | BIT(0);
 
+   dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
+   if (IS_ERR(dssdev->next)) {
+   if (PTR_ERR(dssdev->next) != -EPROBE_DEFER)
+   dev_err(>dev, "failed to find video sink\n");
+   return PTR_ERR(dssdev->next);
+   }
+
omapdss_device_register(dssdev);
 
return 0;
@@ -202,6 +209,8 @@ static int __exit tfp410_remove(struct platform_device 
*pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
+   if (dssdev->next)
+   omapdss_device_put(dssdev->next);
omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index d21d0829774e..e6adeebb91d1 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -301,6 +301,13 @@ static int tpd_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
dssdev->of_ports = BIT(1) | BIT(0);
 
+   dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
+   if (IS_ERR(dssdev->next)) {
+   if (PTR_ERR(dssdev->next) != -EPROBE_DEFER)
+   dev_err(>dev, "failed to find video sink\n");
+   return PTR_ERR(dssdev->next);
+   }
+
omapdss_device_register(dssdev);
 
return 0;
@@ -311,6 +318,8 @@ static int __exit tpd_remove(struct platform_device *pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
+   if (dssdev->next)
+   omapdss_device_put(dssdev->next);
omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index e97f54d5f3e1..650becdf2763 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -688,7 +688,7 @@ static const struct omap_dss_device_ops dpi_ops = {
.set_timings = dpi_set_timings,
 };
 
-static void dpi_init_output_port(struct dpi_data *dpi, struct device_node 
*port)
+static int dpi_init_output_port(struct 

[PATCH v2 38/60] drm/omap: dss: Cleanup error paths in output init functions

[Laurent Pinchart]

Rename the jump labels according to the cleanup they perform, not the
location they're accessed from, and move functions from error checks to
cleanup paths, and move reference handling to simplify cleanup.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dpi.c   | 10 ++
 drivers/gpu/drm/omapdrm/dss/dsi.c   |  9 -
 drivers/gpu/drm/omapdrm/dss/hdmi4.c |  7 ---
 drivers/gpu/drm/omapdrm/dss/hdmi5.c |  7 ---
 drivers/gpu/drm/omapdrm/dss/sdi.c   |  7 ++-
 drivers/gpu/drm/omapdrm/dss/venc.c  |  7 +++
 6 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 8a7c951a413c..e97f54d5f3e1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -745,15 +745,14 @@ int dpi_init_port(struct dss_device *dss, struct 
platform_device *pdev,
return 0;
 
r = of_property_read_u32(ep, "data-lines", );
+   of_node_put(ep);
if (r) {
DSSERR("failed to parse datalines\n");
-   goto err_datalines;
+   return r;
}
 
dpi->data_lines = datalines;
 
-   of_node_put(ep);
-
dpi->pdev = pdev;
dpi->dss_model = dss_model;
dpi->dss = dss;
@@ -764,11 +763,6 @@ int dpi_init_port(struct dss_device *dss, struct 
platform_device *pdev,
dpi_init_output_port(dpi, port);
 
return 0;
-
-err_datalines:
-   of_node_put(ep);
-
-   return r;
 }
 
 void dpi_uninit_port(struct device_node *port)
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index b3e50d8a7477..278094f29255 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5360,7 +5360,7 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
 
r = dsi_runtime_get(dsi);
if (r)
-   goto err_runtime_get;
+   goto err_pm_disable;
 
rev = dsi_read_reg(dsi, DSI_REVISION);
dev_dbg(dev, "OMAP DSI rev %d.%d\n",
@@ -5381,7 +5381,7 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
r = dsi_probe_of(dsi);
if (r) {
DSSERR("Invalid DSI DT data\n");
-   goto err_probe_of;
+   goto err_uninit_output;
}
 
r = of_platform_populate(dev->of_node, NULL, NULL, dev);
@@ -5404,11 +5404,10 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
 
return 0;
 
-err_probe_of:
+err_uninit_output:
dsi_uninit_output(dsi);
dsi_runtime_put(dsi);
-
-err_runtime_get:
+err_pm_disable:
pm_runtime_disable(dev);
return r;
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index bf800cede2ad..1d1f2e0b2b2a 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -780,9 +780,7 @@ static int hdmi4_bind(struct device *dev, struct device 
*master, void *data)
r = hdmi_audio_register(hdmi);
if (r) {
DSSERR("Registering HDMI audio failed\n");
-   hdmi_uninit_output(hdmi);
-   pm_runtime_disable(>dev);
-   return r;
+   goto err_uninit_output;
}
 
hdmi->debugfs = dss_debugfs_create_file(dss, "hdmi", hdmi_dump_regs,
@@ -790,6 +788,9 @@ static int hdmi4_bind(struct device *dev, struct device 
*master, void *data)
 
return 0;
 
+err_uninit_output:
+   hdmi_uninit_output(hdmi);
+   pm_runtime_disable(>dev);
 err_pll:
hdmi_pll_uninit(>pll);
 err_free:
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index e5d23dd19f99..92ae561bf974 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -773,9 +773,7 @@ static int hdmi5_bind(struct device *dev, struct device 
*master, void *data)
r = hdmi_audio_register(hdmi);
if (r) {
DSSERR("Registering HDMI audio failed %d\n", r);
-   hdmi_uninit_output(hdmi);
-   pm_runtime_disable(>dev);
-   return r;
+   goto err_uninit_output;
}
 
hdmi->debugfs = dss_debugfs_create_file(dss, "hdmi", hdmi_dump_regs,
@@ -783,6 +781,9 @@ static int hdmi5_bind(struct device *dev, struct device 
*master, void *data)
 
return 0;
 
+err_uninit_output:
+   hdmi_uninit_output(hdmi);
+   pm_runtime_disable(>dev);
 err_pll:
hdmi_pll_uninit(>pll);
 err_free:
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c 
b/drivers/gpu/drm/omapdrm/dss/sdi.c
index fd5320041911..0ace553a21c5 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -355,16 +355,15 @@ int sdi_init_port(struct dss_device *dss, struct 
platform_device *pdev,
}
 
r = of_property_read_u32(ep, 

[PATCH v2 40/60] drm/omap: dss: hdmi4: Move initialization code from bind to probe

[Laurent Pinchart]

There's no reason to delay initialization of most of the driver (such as
mapping memory I/O or enabling runtime PM) to the component bind
handler. Perform as much of the initialization as possible at probe
time, initializing at bind time only the parts that depends on the DSS.
The cleanup code is moved from unbind to remove in a similar way.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 218 +++-
 1 file changed, 117 insertions(+), 101 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c 
b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 1d1f2e0b2b2a..89fdce02278c 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -553,53 +553,10 @@ static const struct omap_dss_device_ops hdmi_ops = {
},
 };
 
-static void hdmi_init_output(struct omap_hdmi *hdmi)
-{
-   struct omap_dss_device *out = >output;
-
-   out->dev = >pdev->dev;
-   out->id = OMAP_DSS_OUTPUT_HDMI;
-   out->output_type = OMAP_DISPLAY_TYPE_HDMI;
-   out->name = "hdmi.0";
-   out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
-   out->ops = _ops;
-   out->owner = THIS_MODULE;
-   out->of_ports = BIT(0);
-
-   omapdss_device_register(out);
-}
-
-static void hdmi_uninit_output(struct omap_hdmi *hdmi)
-{
-   struct omap_dss_device *out = >output;
-
-   omapdss_device_unregister(out);
-}
-
-static int hdmi_probe_of(struct omap_hdmi *hdmi)
-{
-   struct platform_device *pdev = hdmi->pdev;
-   struct device_node *node = pdev->dev.of_node;
-   struct device_node *ep;
-   int r;
-
-   ep = of_graph_get_endpoint_by_regs(node, 0, 0);
-   if (!ep)
-   return 0;
-
-   r = hdmi_parse_lanes_of(pdev, ep, >phy);
-   if (r)
-   goto err;
-
-   of_node_put(ep);
-   return 0;
-
-err:
-   of_node_put(ep);
-   return r;
-}
+/* 
-
+ * Audio Callbacks
+ */
 
-/* Audio callbacks */
 static int hdmi_audio_startup(struct device *dev,
  void (*abort_cb)(struct device *dev))
 {
@@ -714,27 +671,123 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
return 0;
 }
 
-/* HDMI HW IP initialisation */
+/* 
-
+ * Component Bind & Unbind
+ */
+
 static int hdmi4_bind(struct device *dev, struct device *master, void *data)
 {
-   struct platform_device *pdev = to_platform_device(dev);
struct dss_device *dss = dss_get_device(master);
-   struct omap_hdmi *hdmi;
+   struct omap_hdmi *hdmi = dev_get_drvdata(dev);
int r;
+
+   hdmi->dss = dss;
+
+   r = hdmi_pll_init(dss, hdmi->pdev, >pll, >wp);
+   if (r)
+   return r;
+
+   r = hdmi4_cec_init(hdmi->pdev, >core, >wp);
+   if (r)
+   goto err_pll_uninit;
+
+   r = hdmi_audio_register(hdmi);
+   if (r) {
+   DSSERR("Registering HDMI audio failed\n");
+   goto err_cec_uninit;
+   }
+
+   hdmi->debugfs = dss_debugfs_create_file(dss, "hdmi", hdmi_dump_regs,
+  hdmi);
+
+   return 0;
+
+err_cec_uninit:
+   hdmi4_cec_uninit(>core);
+err_pll_uninit:
+   hdmi_pll_uninit(>pll);
+   return r;
+}
+
+static void hdmi4_unbind(struct device *dev, struct device *master, void *data)
+{
+   struct omap_hdmi *hdmi = dev_get_drvdata(dev);
+
+   dss_debugfs_remove_file(hdmi->debugfs);
+
+   if (hdmi->audio_pdev)
+   platform_device_unregister(hdmi->audio_pdev);
+
+   hdmi4_cec_uninit(>core);
+   hdmi_pll_uninit(>pll);
+}
+
+static const struct component_ops hdmi4_component_ops = {
+   .bind   = hdmi4_bind,
+   .unbind = hdmi4_unbind,
+};
+
+/* 
-
+ * Probe & Remove, Suspend & Resume
+ */
+
+static void hdmi4_init_output(struct omap_hdmi *hdmi)
+{
+   struct omap_dss_device *out = >output;
+
+   out->dev = >pdev->dev;
+   out->id = OMAP_DSS_OUTPUT_HDMI;
+   out->output_type = OMAP_DISPLAY_TYPE_HDMI;
+   out->name = "hdmi.0";
+   out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
+   out->ops = _ops;
+   out->owner = THIS_MODULE;
+   out->of_ports = BIT(0);
+
+   omapdss_device_register(out);
+}
+
+static void hdmi4_uninit_output(struct omap_hdmi *hdmi)
+{
+   struct omap_dss_device *out = >output;
+
+   omapdss_device_unregister(out);
+}
+
+static int hdmi4_probe_of(struct omap_hdmi *hdmi)
+{
+   struct platform_device *pdev = hdmi->pdev;
+   struct device_node *node = pdev->dev.of_node;
+   struct device_node *ep;
+   int r;
+
+   ep = of_graph_get_endpoint_by_regs(node, 0, 0);
+   if (!ep)
+   return 0;
+
+   r = hdmi_parse_lanes_of(pdev, ep, 

[PATCH v2 33/60] drm/omap: dss: Move DSS mgr ops and private data to dss_device

[Laurent Pinchart]

The DSS manager ops and private data pointer are specific to a DSS
instance. Store them in the dss_device structure instead of global
variable.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dss.h |  2 ++
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  5 +--
 drivers/gpu/drm/omapdrm/dss/output.c  | 58 ---
 drivers/gpu/drm/omapdrm/omap_crtc.c   |  6 ++--
 drivers/gpu/drm/omapdrm/omap_crtc.h   |  2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c|  4 +--
 6 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h 
b/drivers/gpu/drm/omapdrm/dss/dss.h
index a4514843e925..54f96241b9ea 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -266,6 +266,8 @@ struct dss_device {
 
struct dispc_device *dispc;
const struct dispc_ops *dispc_ops;
+   const struct dss_mgr_ops *mgr_ops;
+   struct omap_drm_private *mgr_ops_priv;
 };
 
 /* core */
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 4befe8aab333..4df405ae20db 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -574,9 +574,10 @@ struct dss_mgr_ops {
void (*handler)(void *), void *data);
 };
 
-int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops,
+int dss_install_mgr_ops(struct dss_device *dss,
+   const struct dss_mgr_ops *mgr_ops,
struct omap_drm_private *priv);
-void dss_uninstall_mgr_ops(void);
+void dss_uninstall_mgr_ops(struct dss_device *dss);
 
 int dss_mgr_connect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst);
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index b5bf7a5e35d9..a5df6eed4aef 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -21,6 +21,7 @@
 #include 
 #include 
 
+#include "dss.h"
 #include "omapdss.h"
 
 static DEFINE_MUTEX(output_lock);
@@ -99,90 +100,97 @@ struct omap_dss_device 
*omapdss_find_output_from_display(struct omap_dss_device
 }
 EXPORT_SYMBOL(omapdss_find_output_from_display);
 
-static const struct dss_mgr_ops *dss_mgr_ops;
-static struct omap_drm_private *dss_mgr_ops_priv;
-
-int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops,
+int dss_install_mgr_ops(struct dss_device *dss,
+   const struct dss_mgr_ops *mgr_ops,
struct omap_drm_private *priv)
 {
-   if (dss_mgr_ops)
+   if (dss->mgr_ops)
return -EBUSY;
 
-   dss_mgr_ops = mgr_ops;
-   dss_mgr_ops_priv = priv;
+   dss->mgr_ops = mgr_ops;
+   dss->mgr_ops_priv = priv;
 
return 0;
 }
 EXPORT_SYMBOL(dss_install_mgr_ops);
 
-void dss_uninstall_mgr_ops(void)
+void dss_uninstall_mgr_ops(struct dss_device *dss)
 {
-   dss_mgr_ops = NULL;
-   dss_mgr_ops_priv = NULL;
+   dss->mgr_ops = NULL;
+   dss->mgr_ops_priv = NULL;
 }
 EXPORT_SYMBOL(dss_uninstall_mgr_ops);
 
 int dss_mgr_connect(struct omap_dss_device *dssdev, struct omap_dss_device 
*dst)
 {
-   return dss_mgr_ops->connect(dss_mgr_ops_priv,
-   dssdev->dispc_channel, dst);
+   return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
+dssdev->dispc_channel, dst);
 }
 EXPORT_SYMBOL(dss_mgr_connect);
 
 void dss_mgr_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst)
 {
-   dss_mgr_ops->disconnect(dss_mgr_ops_priv, dssdev->dispc_channel, dst);
+   dssdev->dss->mgr_ops->disconnect(dssdev->dss->mgr_ops_priv,
+dssdev->dispc_channel, dst);
 }
 EXPORT_SYMBOL(dss_mgr_disconnect);
 
 void dss_mgr_set_timings(struct omap_dss_device *dssdev,
 const struct videomode *vm)
 {
-   dss_mgr_ops->set_timings(dss_mgr_ops_priv, dssdev->dispc_channel, vm);
+   dssdev->dss->mgr_ops->set_timings(dssdev->dss->mgr_ops_priv,
+ dssdev->dispc_channel, vm);
 }
 EXPORT_SYMBOL(dss_mgr_set_timings);
 
 void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev,
const struct dss_lcd_mgr_config *config)
 {
-   dss_mgr_ops->set_lcd_config(dss_mgr_ops_priv,
-   dssdev->dispc_channel, config);
+   dssdev->dss->mgr_ops->set_lcd_config(dssdev->dss->mgr_ops_priv,
+dssdev->dispc_channel, config);
 }
 EXPORT_SYMBOL(dss_mgr_set_lcd_config);
 
 int dss_mgr_enable(struct omap_dss_device *dssdev)
 {
-   return dss_mgr_ops->enable(dss_mgr_ops_priv, dssdev->dispc_channel);
+   return dssdev->dss->mgr_ops->enable(dssdev->dss->mgr_ops_priv,
+   dssdev->dispc_channel);
 }
 EXPORT_SYMBOL(dss_mgr_enable);
 

[PATCH v2 44/60] drm/omap: dss: Add for_each_dss_output() macro

[Laurent Pinchart]

Similarly to for_each_dss_display(), the for_each_dss_output() macro
iterates over all the DSS connected outputs.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 20 ++--
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  9 ++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 96be800a0f25..519682f18d36 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -127,11 +127,13 @@ struct omap_dss_device 
*omapdss_find_device_by_port(struct device_node *src,
 
 /*
  * Search for the next device starting at @from. If display_only is true, skip
- * non-display devices. Release the reference to the @from device, and acquire
- * a reference to the returned device if found.
+ * non-display devices. If output_only is true, skip non-output devices and
+ * non-connected output devices. Release the reference to the @from device, and
+ * acquire a reference to the returned device if found.
  */
 struct omap_dss_device *omapdss_device_get_next(struct omap_dss_device *from,
-   bool display_only)
+   bool display_only,
+   bool output_only)
 {
struct omap_dss_device *dssdev;
struct list_head *list;
@@ -159,9 +161,15 @@ struct omap_dss_device *omapdss_device_get_next(struct 
omap_dss_device *from,
goto done;
}
 
-   /* Filter out non-display entries if display_only is set. */
-   if (!display_only || dssdev->driver)
-   goto done;
+   /*
+* Filter out non-display entries if display_only is set, and
+* non-output entries if output_only is set.
+*/
+   if (display_only && !dssdev->driver)
+   continue;
+   if (output_only && (!dssdev->id || !dssdev->next))
+   continue;
+   goto done;
}
 
dssdev = NULL;
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 5d3e4ced73d1..723124f6e596 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -488,9 +488,9 @@ static inline bool omapdss_is_initialized(void)
return !!omapdss_get_dss();
 }
 
-void omapdss_display_init(struct omap_dss_device *dssdev);
 #define for_each_dss_display(d) \
-   while ((d = omapdss_device_get_next(d, true)) != NULL)
+   while ((d = omapdss_device_get_next(d, true, false)) != NULL)
+void omapdss_display_init(struct omap_dss_device *dssdev);
 
 void omapdss_device_register(struct omap_dss_device *dssdev);
 void omapdss_device_unregister(struct omap_dss_device *dssdev);
@@ -499,7 +499,8 @@ void omapdss_device_put(struct omap_dss_device *dssdev);
 struct omap_dss_device *omapdss_find_device_by_port(struct device_node *src,
unsigned int port);
 struct omap_dss_device *omapdss_device_get_next(struct omap_dss_device *from,
-   bool display_only);
+   bool display_only,
+   bool output_only);
 int omapdss_device_connect(struct dss_device *dss,
   struct omap_dss_device *src,
   struct omap_dss_device *dst);
@@ -511,6 +512,8 @@ int omap_dss_get_num_overlay_managers(void);
 
 int omap_dss_get_num_overlays(void);
 
+#define for_each_dss_output(d) \
+   while ((d = omapdss_device_get_next(d, false, true)) != NULL)
 int omapdss_output_set_device(struct omap_dss_device *out,
struct omap_dss_device *dssdev);
 int omapdss_output_unset_device(struct omap_dss_device *out);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 39/60] drm/omap: dss: dsi: Move initialization code from bind to probe

[Laurent Pinchart]

There's no reason to delay initialization of most of the driver (such as
mapping memory I/O or enabling runtime PM) to the component bind
handler. Perform as much of the initialization as possible at probe
time, initializing at bind time only the parts that depends on the DSS.
The cleanup code is moved from unbind to remove in a similar way.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 301 --
 1 file changed, 161 insertions(+), 140 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 278094f29255..79312e53bfd9 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4981,85 +4981,9 @@ static const struct omap_dss_device_ops dsi_ops = {
},
 };
 
-static void dsi_init_output(struct dsi_data *dsi)
-{
-   struct omap_dss_device *out = >output;
-
-   out->dev = dsi->dev;
-   out->id = dsi->module_id == 0 ?
-   OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2;
-
-   out->output_type = OMAP_DISPLAY_TYPE_DSI;
-   out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1";
-   out->dispc_channel = dsi_get_channel(dsi);
-   out->ops = _ops;
-   out->owner = THIS_MODULE;
-   out->of_ports = BIT(0);
-
-   omapdss_device_register(out);
-}
-
-static void dsi_uninit_output(struct dsi_data *dsi)
-{
-   struct omap_dss_device *out = >output;
-
-   omapdss_device_unregister(out);
-}
-
-static int dsi_probe_of(struct dsi_data *dsi)
-{
-   struct device_node *node = dsi->dev->of_node;
-   struct property *prop;
-   u32 lane_arr[10];
-   int len, num_pins;
-   int r, i;
-   struct device_node *ep;
-   struct omap_dsi_pin_config pin_cfg;
-
-   ep = of_graph_get_endpoint_by_regs(node, 0, 0);
-   if (!ep)
-   return 0;
-
-   prop = of_find_property(ep, "lanes", );
-   if (prop == NULL) {
-   dev_err(dsi->dev, "failed to find lane data\n");
-   r = -EINVAL;
-   goto err;
-   }
-
-   num_pins = len / sizeof(u32);
-
-   if (num_pins < 4 || num_pins % 2 != 0 ||
-   num_pins > dsi->num_lanes_supported * 2) {
-   dev_err(dsi->dev, "bad number of lanes\n");
-   r = -EINVAL;
-   goto err;
-   }
-
-   r = of_property_read_u32_array(ep, "lanes", lane_arr, num_pins);
-   if (r) {
-   dev_err(dsi->dev, "failed to read lane data\n");
-   goto err;
-   }
-
-   pin_cfg.num_pins = num_pins;
-   for (i = 0; i < num_pins; ++i)
-   pin_cfg.pins[i] = (int)lane_arr[i];
-
-   r = dsi_configure_pins(>output, _cfg);
-   if (r) {
-   dev_err(dsi->dev, "failed to configure pins");
-   goto err;
-   }
-
-   of_node_put(ep);
-
-   return 0;
-
-err:
-   of_node_put(ep);
-   return r;
-}
+/* 
-
+ * PLL
+ */
 
 static const struct dss_pll_ops dsi_pll_ops = {
.enable = dsi_pll_enable,
@@ -5174,7 +5098,153 @@ static int dsi_init_pll_data(struct dss_device *dss, 
struct dsi_data *dsi)
return 0;
 }
 
-/* DSI1 HW IP initialisation */
+/* 
-
+ * Component Bind & Unbind
+ */
+
+static int dsi_bind(struct device *dev, struct device *master, void *data)
+{
+   struct dss_device *dss = dss_get_device(master);
+   struct dsi_data *dsi = dev_get_drvdata(dev);
+   char name[10];
+   u32 rev;
+   int r;
+
+   dsi->dss = dss;
+
+   dsi_init_pll_data(dss, dsi);
+
+   r = dsi_runtime_get(dsi);
+   if (r)
+   return r;
+
+   rev = dsi_read_reg(dsi, DSI_REVISION);
+   dev_dbg(dev, "OMAP DSI rev %d.%d\n",
+  FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+   dsi->line_buffer_size = dsi_get_line_buf_size(dsi);
+
+   dsi_runtime_put(dsi);
+
+   snprintf(name, sizeof(name), "dsi%u_regs", dsi->module_id + 1);
+   dsi->debugfs.regs = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_regs, );
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+   snprintf(name, sizeof(name), "dsi%u_irqs", dsi->module_id + 1);
+   dsi->debugfs.irqs = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_irqs, );
+#endif
+   snprintf(name, sizeof(name), "dsi%u_clks", dsi->module_id + 1);
+   dsi->debugfs.clks = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_clocks, );
+
+   return 0;
+}
+
+static void dsi_unbind(struct device *dev, struct device *master, void *data)
+{
+   struct dsi_data *dsi = dev_get_drvdata(dev);
+
+   dss_debugfs_remove_file(dsi->debugfs.clks);
+   

[PATCH v2 31/60] drm/omap: dss: Move and rename omap_dss_(get|put)_device()

[Laurent Pinchart]

The functions operate on any omap_dss_device, move them from display.c
to base.c. While at it rename them to match the naming of the other
functions operating on struct omap_dss_device.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  4 ++--
 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  |  4 ++--
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  4 ++--
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  4 ++--
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   |  4 ++--
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c|  4 ++--
 .../omapdrm/displays/panel-lgphilips-lb035q02.c|  4 ++--
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c|  4 ++--
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |  4 ++--
 .../drm/omapdrm/displays/panel-sony-acx565akm.c|  4 ++--
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c|  4 ++--
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c|  4 ++--
 drivers/gpu/drm/omapdrm/dss/base.c | 27 +++---
 drivers/gpu/drm/omapdrm/dss/display.c  | 24 ---
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  5 ++--
 drivers/gpu/drm/omapdrm/dss/output.c   |  2 +-
 drivers/gpu/drm/omapdrm/omap_connector.c   |  4 ++--
 drivers/gpu/drm/omapdrm/omap_crtc.c|  2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c |  8 +++
 21 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index f1d1c67d72b8..a7eb25bd9283 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -55,7 +55,7 @@ static int tvc_connect(struct omap_dss_device *dssdev)
 
r = omapdss_device_connect(src, dssdev);
if (r) {
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
return r;
}
 
@@ -68,7 +68,7 @@ static void tvc_disconnect(struct omap_dss_device *dssdev)
 
omapdss_device_disconnect(src, dssdev);
 
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
 }
 
 static int tvc_enable(struct omap_dss_device *dssdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 9e0b5a0b2eea..3e71af9ba0c3 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -69,7 +69,7 @@ static int dvic_connect(struct omap_dss_device *dssdev)
 
r = omapdss_device_connect(src, dssdev);
if (r) {
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
return r;
}
 
@@ -82,7 +82,7 @@ static void dvic_disconnect(struct omap_dss_device *dssdev)
 
omapdss_device_disconnect(src, dssdev);
 
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
 }
 
 static int dvic_enable(struct omap_dss_device *dssdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 064b051c0a29..fd0bad4dc7c9 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -65,7 +65,7 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
 
r = omapdss_device_connect(src, dssdev);
if (r) {
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
return r;
}
 
@@ -78,7 +78,7 @@ static void hdmic_disconnect(struct omap_dss_device *dssdev)
 
omapdss_device_disconnect(src, dssdev);
 
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
 }
 
 static int hdmic_enable(struct omap_dss_device *dssdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index c1ed4e2ce8f3..01b00eea3a98 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -45,7 +45,7 @@ static int opa362_connect(struct omap_dss_device *dssdev,
 
r = omapdss_device_connect(src, dssdev);
if (r) {
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
return r;
}
 
@@ -60,7 +60,7 @@ static void opa362_disconnect(struct omap_dss_device *dssdev,
 
omapdss_device_disconnect(src, >dssdev);
 
-   omap_dss_put_device(src);
+   omapdss_device_put(src);
 }
 
 static int opa362_enable(struct omap_dss_device *dssdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index b360a68f074d..6f71d2b7de03 100644
--- 

[PATCH v2 37/60] drm/omap: displays: Don't cast dssdev to panel data unnecessarily

[Laurent Pinchart]

The connect handle of the analog TV and HDMI connectors casts the dssdev
to panel data only to then access fields of the panel data that are also
present in the dssdev. Remove the cast and use dssdev directly.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 5 ++---
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 4f32c8ddcfbd..eab898b5bf0f 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -43,13 +43,12 @@ static const struct videomode tvc_pal_vm = {
 
 static int tvc_connect(struct omap_dss_device *dssdev)
 {
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *src;
int r;
 
-   src = omapdss_of_find_connected_device(ddata->dev->of_node, 0);
+   src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
if (IS_ERR_OR_NULL(src)) {
-   dev_err(ddata->dev, "failed to find video source\n");
+   dev_err(dssdev->dev, "failed to find video source\n");
return src ? PTR_ERR(src) : -EINVAL;
}
 
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index b3f88ab0cd6e..cf06b47d6ce7 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -53,13 +53,12 @@ struct panel_drv_data {
 
 static int hdmic_connect(struct omap_dss_device *dssdev)
 {
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *src;
int r;
 
-   src = omapdss_of_find_connected_device(ddata->dev->of_node, 0);
+   src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
if (IS_ERR_OR_NULL(src)) {
-   dev_err(ddata->dev, "failed to find video source\n");
+   dev_err(dssdev->dev, "failed to find video source\n");
return src ? PTR_ERR(src) : -EINVAL;
}
 
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 27/60] drm/omap: dss: Rename for_each_dss_dev macro to for_each_dss_display

[Laurent Pinchart]

The macro iterates over displays only, rename it accordingly.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dss.c | 2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c| 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index 8e7646181302..5b7613ff2f2e 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1557,7 +1557,7 @@ static void dss_shutdown(struct platform_device *pdev)
 
DSSDBG("shutdown\n");
 
-   for_each_dss_dev(dssdev) {
+   for_each_dss_display(dssdev) {
if (!dssdev->driver)
continue;
 
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 26abc09f3d4a..a6ddc881ea72 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -501,7 +501,7 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
 
 struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
 void omap_dss_put_device(struct omap_dss_device *dssdev);
-#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
+#define for_each_dss_display(d) while ((d = omap_dss_get_next_device(d)) != 
NULL)
 struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
 
 int omap_dss_get_num_overlay_managers(void);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index f1df5be198a8..21ca4002ac38 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -188,7 +188,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
if (!omapdss_stack_is_ready())
return -EPROBE_DEFER;
 
-   for_each_dss_dev(dssdev) {
+   for_each_dss_display(dssdev) {
r = omapdss_device_connect(dssdev, NULL);
if (r == -EPROBE_DEFER) {
omap_dss_put_device(dssdev);
@@ -200,7 +200,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
omap_dss_get_device(dssdev);
priv->dssdevs[priv->num_dssdevs++] = dssdev;
if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
-   /* To balance the 'for_each_dss_dev' loop */
+   /* To balance the 'for_each_dss_display' loop */
omap_dss_put_device(dssdev);
break;
}
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 22/60] drm/omap: dss: Move src and dst check and set to connection handlers

[Laurent Pinchart]

The encoders duplicate the same omap_dss_device src and dst fields set
and checks in their connect and disconnect handlers. Move the code to
the connect and disconnect wrappers.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  | 10 -
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  | 10 -
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   | 11 --
 drivers/gpu/drm/omapdrm/dss/base.c | 24 --
 drivers/gpu/drm/omapdrm/dss/dpi.c  |  5 -
 drivers/gpu/drm/omapdrm/dss/dsi.c  |  5 -
 drivers/gpu/drm/omapdrm/dss/hdmi4.c|  5 -
 drivers/gpu/drm/omapdrm/dss/hdmi5.c|  5 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  8 +++-
 drivers/gpu/drm/omapdrm/dss/output.c   |  6 --
 drivers/gpu/drm/omapdrm/dss/sdi.c  |  5 -
 drivers/gpu/drm/omapdrm/dss/venc.c |  5 -
 12 files changed, 25 insertions(+), 74 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 5b9ef09e6b2d..6baca0dc2b62 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -51,9 +51,6 @@ static int opa362_connect(struct omap_dss_device *dssdev,
return r;
}
 
-   dst->src = dssdev;
-   dssdev->dst = dst;
-
ddata->in = in;
return 0;
 }
@@ -64,13 +61,6 @@ static void opa362_disconnect(struct omap_dss_device *dssdev,
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   WARN_ON(dst != dssdev->dst);
-   if (dst != dssdev->dst)
-   return;
-
-   dst->src = NULL;
-   dssdev->dst = NULL;
-
omapdss_device_disconnect(in, >dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index b22c8f71c0e5..c1ae8bebf04d 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -47,9 +47,6 @@ static int tfp410_connect(struct omap_dss_device *dssdev,
return r;
}
 
-   dst->src = dssdev;
-   dssdev->dst = dst;
-
ddata->in = in;
return 0;
 }
@@ -60,13 +57,6 @@ static void tfp410_disconnect(struct omap_dss_device *dssdev,
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   WARN_ON(dst != dssdev->dst);
-   if (dst != dssdev->dst)
-   return;
-
-   dst->src = NULL;
-   dssdev->dst = NULL;
-
omapdss_device_disconnect(in, >dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 640f15b88467..8aa338d01bf7 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -55,9 +55,6 @@ static int tpd_connect(struct omap_dss_device *dssdev,
return r;
}
 
-   dst->src = dssdev;
-   dssdev->dst = dst;
-
gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 1);
gpiod_set_value_cansleep(ddata->ls_oe_gpio, 1);
 
@@ -74,17 +71,9 @@ static void tpd_disconnect(struct omap_dss_device *dssdev,
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   WARN_ON(dst != dssdev->dst);
-
-   if (dst != dssdev->dst)
-   return;
-
gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 0);
gpiod_set_value_cansleep(ddata->ls_oe_gpio, 0);
 
-   dst->src = NULL;
-   dssdev->dst = NULL;
-
omapdss_device_disconnect(in, >dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 01c117d8775b..810dcddded8a 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -105,15 +105,27 @@ struct omap_dss_device 
*omapdss_find_device_by_port(struct device_node *src,
 int omapdss_device_connect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
+   int ret;
+
dev_dbg(src->dev, "connect\n");
 
if (omapdss_device_is_connected(src))
return -EBUSY;
 
if (src->driver)
-   return src->driver->connect(src);
+   ret = src->driver->connect(src);
else
-   return src->ops->connect(src, dst);
+   ret = src->ops->connect(src, dst);
+
+   if (ret < 0)
+   return ret;
+
+   if (dst) {
+   dst->src = src;
+   src->dst = dst;
+   }
+
+   return 0;
 }
 

[PATCH v2 30/60] drm/omap: dss: Remove panel devices list

[Laurent Pinchart]

The panel devices list isn't used anymore, all panel devices are
accessed through the global devices list. Remove it.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  9 ++--
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   | 14 ++-
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |  8 ++-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   |  8 ++-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c|  8 ++-
 .../omapdrm/displays/panel-lgphilips-lb035q02.c|  8 ++-
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c|  8 ++-
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |  8 ++-
 .../drm/omapdrm/displays/panel-sony-acx565akm.c| 27 +++---
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c|  8 ++-
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c| 22 --
 drivers/gpu/drm/omapdrm/dss/display.c  | 23 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  3 ---
 13 files changed, 31 insertions(+), 123 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index fb23fae7fbf4..f1d1c67d72b8 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -154,7 +154,6 @@ static int tvc_probe(struct platform_device *pdev)
 {
struct panel_drv_data *ddata;
struct omap_dss_device *dssdev;
-   int r;
 
ddata = devm_kzalloc(>dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata)
@@ -172,11 +171,7 @@ static int tvc_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
 
omapdss_display_init(dssdev);
-   r = omapdss_register_display(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register panel\n");
-   return r;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
 }
@@ -186,7 +181,7 @@ static int __exit tvc_remove(struct platform_device *pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_display(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
tvc_disable(dssdev);
tvc_disconnect(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 5333fb166c83..9e0b5a0b2eea 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -391,19 +391,9 @@ static int dvic_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
 
omapdss_display_init(dssdev);
-   r = omapdss_register_display(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register panel\n");
-   goto err_reg;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
-
-err_reg:
-   i2c_put_adapter(ddata->i2c_adapter);
-   mutex_destroy(>hpd_lock);
-
-   return r;
 }
 
 static int __exit dvic_remove(struct platform_device *pdev)
@@ -411,7 +401,7 @@ static int __exit dvic_remove(struct platform_device *pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_display(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
dvic_disable(dssdev);
dvic_disconnect(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 2c5e8cf70c9f..064b051c0a29 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -351,11 +351,7 @@ static int hdmic_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
 
omapdss_display_init(dssdev);
-   r = omapdss_register_display(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register panel\n");
-   return r;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
 }
@@ -365,7 +361,7 @@ static int __exit hdmic_remove(struct platform_device *pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_display(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
hdmic_disable(dssdev);
hdmic_disconnect(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 87f11618e85f..bd598be1ba6b 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -219,11 +219,7 @@ static int panel_dpi_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
 
omapdss_display_init(dssdev);
-   r = 

[PATCH v2 35/60] drm/omap: dss: Replace omap_dss_device port number with bitmask

[Laurent Pinchart]

The omap_dss_device port_num field stores the DT port number associated
with the device. The field is used in different ways depending on the
device type:

- For DPI outputs, the port number is used as an identifier of the DPI
instance

- For sources, the port number is used to look up the omap_dss_device by
DT port node

As omap_dss_device instances are only looked up as sources by sinks,
setting the field to the number of the source port works for both use
cases.

However, to enable looking up sinks, we need to record all the ports
associated with an omap_dss_device. Do so by turning the port_num field
into an of_ports bitmask. For DPI outputs the port number is
additionally stored in the dpi_data structure as the output ID.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c|  1 +
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c  |  1 +
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c |  1 +
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c |  1 +
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c  |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c  |  1 +
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c   |  1 +
 .../drm/omapdrm/displays/panel-lgphilips-lb035q02.c   |  1 +
 .../gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c   |  1 +
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c|  1 +
 .../gpu/drm/omapdrm/displays/panel-sony-acx565akm.c   |  1 +
 .../gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c   |  1 +
 .../gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c   |  1 +
 drivers/gpu/drm/omapdrm/dss/base.c|  2 +-
 drivers/gpu/drm/omapdrm/dss/dpi.c | 19 +--
 drivers/gpu/drm/omapdrm/dss/dsi.c |  1 +
 drivers/gpu/drm/omapdrm/dss/hdmi4.c   |  1 +
 drivers/gpu/drm/omapdrm/dss/hdmi5.c   |  1 +
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  4 ++--
 drivers/gpu/drm/omapdrm/dss/sdi.c |  2 +-
 drivers/gpu/drm/omapdrm/dss/venc.c|  1 +
 22 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index f7250db0f3b7..b960c4d0e84d 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -169,6 +169,7 @@ static int tvc_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
+   dssdev->of_ports = BIT(0);
 
omapdss_display_init(dssdev);
omapdss_device_register(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index b4f84baff144..8ff674bf75e6 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -389,6 +389,7 @@ static int dvic_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_DVI;
dssdev->owner = THIS_MODULE;
+   dssdev->of_ports = BIT(0);
 
omapdss_display_init(dssdev);
omapdss_device_register(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 2f8ae93c117a..2afaa2ca602b 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -349,6 +349,7 @@ static int hdmic_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
dssdev->owner = THIS_MODULE;
+   dssdev->of_ports = BIT(0);
 
omapdss_display_init(dssdev);
omapdss_device_register(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 4d7f4dae2c10..eb0ebb850114 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -167,6 +167,7 @@ static int opa362_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->output_type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
+   dssdev->of_ports = BIT(1) | BIT(0);
 
omapdss_device_register(dssdev);
 
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 833544d8502f..fb767d674297 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -190,7 +190,7 @@ static int tfp410_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;

[PATCH v2 29/60] drm/omap: dss: Split omapdss_register_display()

[Laurent Pinchart]

Split the function into omapdss_display_init() to perform
display-specific initialization of the omap_dss_device, and
omapdss_register_display() to register the device. The latter will then
be replaced by more generic registration.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c  | 1 +
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c| 1 +
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c   | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c| 1 +
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c  | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 1 +
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 1 +
 drivers/gpu/drm/omapdrm/dss/display.c   | 6 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h   | 1 +
 13 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index f579bd9ce7cb..fb23fae7fbf4 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -171,6 +171,7 @@ static int tvc_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(>dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 48dbb9df76b5..5333fb166c83 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -390,6 +390,7 @@ static int dvic_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DVI;
dssdev->owner = THIS_MODULE;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(>dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 4acb53788862..2c5e8cf70c9f 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -350,6 +350,7 @@ static int hdmic_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
dssdev->owner = THIS_MODULE;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(>dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 32af5b11b448..87f11618e85f 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -218,6 +218,7 @@ static int panel_dpi_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(>dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 353510af58e7..94275fc931be 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1328,6 +1328,7 @@ static int dsicm_probe(struct platform_device *pdev)
dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c 
b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 5bea3eadd7d2..88c075414b7c 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -270,6 +270,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
 
+   omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(>dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c 
b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index d03339034f18..fafb3e43f390 100644
--- 

[PATCH v2 17/60] drm/omap: dss: Rework output lookup by port node

[Laurent Pinchart]

The omap_dss_find_output_by_port_node() function defined in output.c
looks up an output from its port node. To do so it needs to call helper
functions from dss-of.c to lookup the port parent and the port number.
As omap_dss_find_output_by_port_node() is only called by
omapdss_of_find_source_for_first_ep() from dss-of.c this goes back and
forth between the to source files and isn't very clear.

Simplify the code by passing both the parent and the port number to
omap_dss_find_output_by_port_node() instead of the port node, and rename
the function to omap_dss_find_output_by_port().

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dss-of.c  | 39 ---
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  6 ++
 drivers/gpu/drm/omapdrm/dss/output.c  | 17 +++
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c 
b/drivers/gpu/drm/omapdrm/dss/dss-of.c
index 4602a79c6c44..b51af09e9111 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -21,7 +21,8 @@
 
 #include "omapdss.h"
 
-struct device_node *dss_of_port_get_parent_device(struct device_node *port)
+static struct device_node *
+dss_of_port_get_parent_device(struct device_node *port)
 {
struct device_node *np;
int i;
@@ -45,40 +46,36 @@ struct device_node *dss_of_port_get_parent_device(struct 
device_node *port)
return NULL;
 }
 
-u32 dss_of_port_get_port_number(struct device_node *port)
-{
-   int r;
-   u32 reg;
-
-   r = of_property_read_u32(port, "reg", );
-   if (r)
-   reg = 0;
-
-   return reg;
-}
-
 struct omap_dss_device *
 omapdss_of_find_source_for_first_ep(struct device_node *node)
 {
-   struct device_node *ep;
+   struct device_node *src_node;
struct device_node *src_port;
+   struct device_node *ep;
struct omap_dss_device *src;
+   u32 port_number = 0;
 
+   /* Get the endpoint... */
ep = of_graph_get_endpoint_by_regs(node, 0, 0);
if (!ep)
return ERR_PTR(-EINVAL);
 
+   /* ... and its remote port... */
src_port = of_graph_get_remote_port(ep);
-   if (!src_port) {
-   of_node_put(ep);
-   return ERR_PTR(-EINVAL);
-   }
-
of_node_put(ep);
+   if (!src_port)
+   return ERR_PTR(-EINVAL);
 
-   src = omap_dss_find_output_by_port_node(src_port);
-
+   /* ... and the remote port's number and parent... */
+   of_property_read_u32(src_port, "reg", _number);
+   src_node = dss_of_port_get_parent_device(src_port);
of_node_put(src_port);
+   if (!src_node)
+   return NULL;
+
+   /* ... and finally the source. */
+   src = omap_dss_find_output_by_port(src_node, port_number);
+   of_node_put(src_node);
 
return src ? src : ERR_PTR(-EPROBE_DEFER);
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 1ccf0c67d308..ff0f603bce76 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -576,7 +576,8 @@ int omap_dss_get_num_overlays(void);
 int omapdss_register_output(struct omap_dss_device *output);
 void omapdss_unregister_output(struct omap_dss_device *output);
 struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id);
-struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node 
*port);
+struct omap_dss_device *omap_dss_find_output_by_port(struct device_node *src,
+unsigned int port);
 int omapdss_output_set_device(struct omap_dss_device *out,
struct omap_dss_device *dssdev);
 int omapdss_output_unset_device(struct omap_dss_device *out);
@@ -603,9 +604,6 @@ static inline bool omapdss_device_is_enabled(struct 
omap_dss_device *dssdev)
 struct omap_dss_device *
 omapdss_of_find_source_for_first_ep(struct device_node *node);
 
-struct device_node *dss_of_port_get_parent_device(struct device_node *port);
-u32 dss_of_port_get_port_number(struct device_node *port);
-
 enum dss_writeback_channel {
DSS_WB_LCD1_MGR =   0,
DSS_WB_LCD2_MGR =   1,
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 7f18153a1bde..be254ea42e08 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -122,27 +122,16 @@ struct omap_dss_device *omap_dss_get_output(enum 
omap_dss_output_id id)
 }
 EXPORT_SYMBOL(omap_dss_get_output);
 
-struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node 
*port)
+struct omap_dss_device *omap_dss_find_output_by_port(struct device_node *src,
+unsigned int port)
 {
-   struct device_node *src_node;
struct omap_dss_device *out;
-   u32 reg;
-
-   src_node = 

[PATCH v2 16/60] drm/omap: dss: Create and use omapdss_device_is_registered()

[Laurent Pinchart]

The omapdss_component_is_loaded() function test whether a component is
loaded by checking whether it is present in the displays list or the
outputs list. Simplify the implementation by checking for the component
in the global omap_dss_device list.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 22 +++---
 drivers/gpu/drm/omapdrm/dss/display.c | 18 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  3 ---
 drivers/gpu/drm/omapdrm/dss/output.c  | 13 -
 4 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 18b72d7c717a..63fe0a717884 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -71,6 +71,24 @@ void omapdss_device_unregister(struct omap_dss_device 
*dssdev)
mutex_unlock(_devices_lock);
 }
 
+static bool omapdss_device_is_registered(struct device_node *node)
+{
+   struct omap_dss_device *dssdev;
+   bool found = false;
+
+   mutex_lock(_devices_lock);
+
+   list_for_each_entry(dssdev, _devices_list, list) {
+   if (dssdev->dev->of_node == node) {
+   found = true;
+   break;
+   }
+   }
+
+   mutex_unlock(_devices_lock);
+   return found;
+}
+
 /* 
-
  * Components Handling
  */
@@ -157,9 +175,7 @@ static bool omapdss_component_is_loaded(struct 
omapdss_comp_node *comp)
 {
if (comp->dss_core_component)
return true;
-   if (omapdss_component_is_display(comp->node))
-   return true;
-   if (omapdss_component_is_output(comp->node))
+   if (omapdss_device_is_registered(comp->node))
return true;
 
return false;
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index eacbbf45f737..383512c8a466 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -72,24 +72,6 @@ void omapdss_unregister_display(struct omap_dss_device 
*dssdev)
 }
 EXPORT_SYMBOL(omapdss_unregister_display);
 
-bool omapdss_component_is_display(struct device_node *node)
-{
-   struct omap_dss_device *dssdev;
-   bool found = false;
-
-   mutex_lock(_list_mutex);
-   list_for_each_entry(dssdev, _list, panel_list) {
-   if (dssdev->dev->of_node == node) {
-   found = true;
-   goto out;
-   }
-   }
-out:
-   mutex_unlock(_list_mutex);
-   return found;
-}
-EXPORT_SYMBOL(omapdss_component_is_display);
-
 struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev)
 {
if (!try_module_get(dssdev->owner))
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index e029613509a1..1ccf0c67d308 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -737,9 +737,6 @@ struct dispc_ops {
 struct dispc_device *dispc_get_dispc(struct dss_device *dss);
 const struct dispc_ops *dispc_get_ops(struct dss_device *dss);
 
-bool omapdss_component_is_display(struct device_node *node);
-bool omapdss_component_is_output(struct device_node *node);
-
 bool omapdss_stack_is_ready(void);
 void omapdss_gather_components(struct device *dev);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 1a2d24906edd..7f18153a1bde 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -109,19 +109,6 @@ void omapdss_unregister_output(struct omap_dss_device *out)
 }
 EXPORT_SYMBOL(omapdss_unregister_output);
 
-bool omapdss_component_is_output(struct device_node *node)
-{
-   struct omap_dss_device *out;
-
-   list_for_each_entry(out, _list, output_list) {
-   if (out->dev->of_node == node)
-   return true;
-   }
-
-   return false;
-}
-EXPORT_SYMBOL(omapdss_component_is_output);
-
 struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id)
 {
struct omap_dss_device *out;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 32/60] drm/omap: dss: Store dss_device pointer in omap_dss_device

[Laurent Pinchart]

Storing the dss_device pointer in the omap_dss_device structure will
allow accessing the dss_device from the dss_mgr API functions.

Signed-off-by: Laurent Pinchart 
---
 drivers/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/encoder-opa362.c   |  2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c   |  2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c|  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c|  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c  |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c |  2 +-
 drivers/gpu/drm/omapdrm/dss/base.c  | 11 +--
 drivers/gpu/drm/omapdrm/dss/omapdss.h   |  4 +++-
 drivers/gpu/drm/omapdrm/omap_drv.c  |  2 +-
 17 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index a7eb25bd9283..f7250db0f3b7 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -53,7 +53,7 @@ static int tvc_connect(struct omap_dss_device *dssdev)
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 3e71af9ba0c3..b4f84baff144 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -67,7 +67,7 @@ static int dvic_connect(struct omap_dss_device *dssdev)
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index fd0bad4dc7c9..2f8ae93c117a 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -63,7 +63,7 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 01b00eea3a98..4d7f4dae2c10 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -43,7 +43,7 @@ static int opa362_connect(struct omap_dss_device *dssdev,
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 6f71d2b7de03..833544d8502f 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -39,7 +39,7 @@ static int tfp410_connect(struct omap_dss_device *dssdev,
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 8031f2c087f6..3a3c36fef446 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -48,7 +48,7 @@ static int tpd_connect(struct omap_dss_device *dssdev,
return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(src, dssdev);
+   r = omapdss_device_connect(dssdev->dss, src, dssdev);
if (r) {
omapdss_device_put(src);
return r;
diff 

[PATCH v2 26/60] drm/omap: dss: Remove output devices list

[Laurent Pinchart]

The output devices list isn't used anymore, all output devices are
accessed through the global devices list. Remove it.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |  9 ++-
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  8 ++
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  8 ++
 drivers/gpu/drm/omapdrm/dss/base.c |  2 ++
 drivers/gpu/drm/omapdrm/dss/dpi.c  |  4 +--
 drivers/gpu/drm/omapdrm/dss/dsi.c  |  4 +--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c|  4 +--
 drivers/gpu/drm/omapdrm/dss/hdmi5.c|  4 +--
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  5 
 drivers/gpu/drm/omapdrm/dss/output.c   | 29 --
 drivers/gpu/drm/omapdrm/dss/sdi.c  |  4 +--
 drivers/gpu/drm/omapdrm/dss/venc.c |  4 +--
 12 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index c9c744e0c92e..c1ed4e2ce8f3 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -146,7 +146,6 @@ static int opa362_probe(struct platform_device *pdev)
struct panel_drv_data *ddata;
struct omap_dss_device *dssdev;
struct gpio_desc *gpio;
-   int r;
 
dev_dbg(>dev, "probe\n");
 
@@ -169,11 +168,7 @@ static int opa362_probe(struct platform_device *pdev)
dssdev->output_type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
 
-   r = omapdss_register_output(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register output\n");
-   return r;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
 }
@@ -183,7 +178,7 @@ static int __exit opa362_remove(struct platform_device 
*pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_output(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
if (omapdss_device_is_enabled(dssdev))
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index f568e53a9104..b360a68f074d 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -192,11 +192,7 @@ static int tfp410_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
dssdev->port_num = 1;
 
-   r = omapdss_register_output(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register output\n");
-   return r;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
 }
@@ -206,7 +202,7 @@ static int __exit tfp410_remove(struct platform_device 
*pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_output(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
if (omapdss_device_is_enabled(dssdev))
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 7bbe794e9d21..efeae1401490 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -301,11 +301,7 @@ static int tpd_probe(struct platform_device *pdev)
dssdev->owner = THIS_MODULE;
dssdev->port_num = 1;
 
-   r = omapdss_register_output(dssdev);
-   if (r) {
-   dev_err(>dev, "Failed to register output\n");
-   return r;
-   }
+   omapdss_device_register(dssdev);
 
return 0;
 }
@@ -315,7 +311,7 @@ static int __exit tpd_remove(struct platform_device *pdev)
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct omap_dss_device *dssdev = >dssdev;
 
-   omapdss_unregister_output(>dssdev);
+   omapdss_device_unregister(>dssdev);
 
WARN_ON(omapdss_device_is_enabled(dssdev));
if (omapdss_device_is_enabled(dssdev))
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 810dcddded8a..7cd3076c2140 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -63,6 +63,7 @@ void omapdss_device_register(struct omap_dss_device *dssdev)
list_add_tail(>list, _devices_list);
mutex_unlock(_devices_lock);
 }
+EXPORT_SYMBOL_GPL(omapdss_device_register);
 
 void omapdss_device_unregister(struct omap_dss_device *dssdev)
 {
@@ -70,6 +71,7 @@ void omapdss_device_unregister(struct omap_dss_device *dssdev)
list_del(>list);
mutex_unlock(_devices_lock);
 }

[PATCH v2 36/60] drm/omap: dss: Extend omapdss_of_find_source_for_first_ep() to sinks

[Laurent Pinchart]

The omapdss_of_find_source_for_first_ep() function locates the source
corresponding to the first endpoint of the first port of a device node.
We can easily extend it to locate sinks as well by passing the port
number as a parameter. This will be useful to find sinks in encoders
drivers.

Extend the function and rename it to omapdss_of_find_connected_device()
to reflect its new extended purpose.

Additionally, it is useful to differentiate between failures to return
the connected device because no link exists in the device tree for the
requested port, or because the connected device as described in the
device tree is invalid or not probed yet. Return NULL in the first case
and an error code in the second case, and update the callers
accordingly.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c |  6 +++---
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |  6 +++---
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |  6 +++---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |  2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   |  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c|  6 +++---
 .../gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c|  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c|  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c|  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c|  6 +++---
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c|  6 +++---
 drivers/gpu/drm/omapdrm/dss/dss-of.c   | 14 +++---
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  2 +-
 16 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index b960c4d0e84d..4f32c8ddcfbd 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -47,10 +47,10 @@ static int tvc_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *src;
int r;
 
-   src = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
-   if (IS_ERR(src)) {
+   src = omapdss_of_find_connected_device(ddata->dev->of_node, 0);
+   if (IS_ERR_OR_NULL(src)) {
dev_err(ddata->dev, "failed to find video source\n");
-   return PTR_ERR(src);
+   return src ? PTR_ERR(src) : -EINVAL;
}
 
r = omapdss_device_connect(dssdev->dss, src, dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 8ff674bf75e6..6eae18b42b82 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -61,10 +61,10 @@ static int dvic_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *src;
int r;
 
-   src = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
-   if (IS_ERR(src)) {
+   src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0);
+   if (IS_ERR_OR_NULL(src)) {
dev_err(dssdev->dev, "failed to find video source\n");
-   return PTR_ERR(src);
+   return src ? PTR_ERR(src) : -EINVAL;
}
 
r = omapdss_device_connect(dssdev->dss, src, dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 2afaa2ca602b..b3f88ab0cd6e 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -57,10 +57,10 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *src;
int r;
 
-   src = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
-   if (IS_ERR(src)) {
+   src = omapdss_of_find_connected_device(ddata->dev->of_node, 0);
+   if (IS_ERR_OR_NULL(src)) {
dev_err(ddata->dev, "failed to find video source\n");
-   return PTR_ERR(src);
+   return src ? PTR_ERR(src) : -EINVAL;
}
 
r = omapdss_device_connect(dssdev->dss, src, dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index eb0ebb850114..904ebec5f5e1 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -37,7 +37,7 @@ static int opa362_connect(struct omap_dss_device *dssdev,
struct omap_dss_device *src;
int r;
 
-   src = 

[PATCH v2 28/60] drm/omap: dss: Make omap_dss_get_next_device() more generic

[Laurent Pinchart]

Despite its name, the omap_dss_get_next_device() function operates on
display devices only. Make it more generic by allowing operation on all
devices, with a parameter to specify the device type.

While at it rename the function to omapdss_device_get_next() to match
the naming of the other functions operating on struct omap_dss_device.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 52 +++
 drivers/gpu/drm/omapdrm/dss/display.c | 49 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  6 ++--
 3 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 7cd3076c2140..f7b8958f15bc 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -104,6 +104,58 @@ struct omap_dss_device *omapdss_find_device_by_port(struct 
device_node *src,
return NULL;
 }
 
+/*
+ * Search for the next device starting at @from. If display_only is true, skip
+ * non-display devices. Release the reference to the @from device, and acquire
+ * a reference to the returned device if found.
+ */
+struct omap_dss_device *omapdss_device_get_next(struct omap_dss_device *from,
+   bool display_only)
+{
+   struct omap_dss_device *dssdev;
+   struct list_head *list;
+
+   mutex_lock(_devices_lock);
+
+   if (list_empty(_devices_list)) {
+   dssdev = NULL;
+   goto done;
+   }
+
+   /*
+* Start from the from entry if given or from omapdss_devices_list
+* otherwise.
+*/
+   list = from ? >list : _devices_list;
+
+   list_for_each_entry(dssdev, list, list) {
+   /*
+* Stop if we reach the omapdss_devices_list, that's the end of
+* the list.
+*/
+   if (>list == _devices_list) {
+   dssdev = NULL;
+   goto done;
+   }
+
+   /* Filter out non-display entries if display_only is set. */
+   if (!display_only || dssdev->driver)
+   goto done;
+   }
+
+   dssdev = NULL;
+
+done:
+   if (from)
+   omap_dss_put_device(from);
+   if (dssdev)
+   omap_dss_get_device(dssdev);
+
+   mutex_unlock(_devices_lock);
+   return dssdev;
+}
+EXPORT_SYMBOL(omapdss_device_get_next);
+
 int omapdss_device_connect(struct omap_dss_device *src,
   struct omap_dss_device *dst)
 {
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index 383512c8a466..0c94d5208398 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -92,52 +92,3 @@ void omap_dss_put_device(struct omap_dss_device *dssdev)
module_put(dssdev->owner);
 }
 EXPORT_SYMBOL(omap_dss_put_device);
-
-/*
- * ref count of the found device is incremented.
- * ref count of from-device is decremented.
- */
-struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from)
-{
-   struct list_head *l;
-   struct omap_dss_device *dssdev;
-
-   mutex_lock(_list_mutex);
-
-   if (list_empty(_list)) {
-   dssdev = NULL;
-   goto out;
-   }
-
-   if (from == NULL) {
-   dssdev = list_first_entry(_list, struct omap_dss_device,
-   panel_list);
-   omap_dss_get_device(dssdev);
-   goto out;
-   }
-
-   omap_dss_put_device(from);
-
-   list_for_each(l, _list) {
-   dssdev = list_entry(l, struct omap_dss_device, panel_list);
-   if (dssdev == from) {
-   if (list_is_last(l, _list)) {
-   dssdev = NULL;
-   goto out;
-   }
-
-   dssdev = list_entry(l->next, struct omap_dss_device,
-   panel_list);
-   omap_dss_get_device(dssdev);
-   goto out;
-   }
-   }
-
-   WARN(1, "'from' dssdev not found\n");
-
-   dssdev = NULL;
-out:
-   mutex_unlock(_list_mutex);
-   return dssdev;
-}
-EXPORT_SYMBOL(omap_dss_get_next_device);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index a6ddc881ea72..94a3f98bdd3d 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -489,11 +489,15 @@ static inline bool omapdss_is_initialized(void)
 
 int omapdss_register_display(struct omap_dss_device *dssdev);
 void omapdss_unregister_display(struct omap_dss_device *dssdev);
+#define for_each_dss_display(d) \
+   while ((d = omapdss_device_get_next(d, true)) != NULL)
 
 void omapdss_device_register(struct 

[PATCH v2 24/60] drm/omap: dsi: Simplify debugfs implementation

[Laurent Pinchart]

The DSI debugfs regs and irqs show handlers received a pointer to the
DSI private data. There's no need to look it up from the list of DSS
outputs. Use the pointer directly, this allows simplifying the
implementation of the handlers.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 63 +--
 1 file changed, 14 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 4427389e0049..9952803b58d2 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1518,8 +1518,9 @@ void dsi_dump_clocks(struct seq_file *s)
 }
 
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
-static void dsi_dump_dsi_irqs(struct dsi_data *dsi, struct seq_file *s)
+static int dsi_dump_dsi_irqs(struct seq_file *s, void *p)
 {
+   struct dsi_data *dsi = p;
unsigned long flags;
struct dsi_irq_stats stats;
 
@@ -1603,33 +1604,20 @@ static void dsi_dump_dsi_irqs(struct dsi_data *dsi, 
struct seq_file *s)
PIS(ULPSACTIVENOT_ALL0);
PIS(ULPSACTIVENOT_ALL1);
 #undef PIS
-}
-
-static int dsi1_dump_irqs(struct seq_file *s, void *p)
-{
-   struct dsi_data *dsi = dsi_get_dsi_from_id(0);
 
-   dsi_dump_dsi_irqs(dsi, s);
-   return 0;
-}
-
-static int dsi2_dump_irqs(struct seq_file *s, void *p)
-{
-   struct dsi_data *dsi = dsi_get_dsi_from_id(1);
-
-   dsi_dump_dsi_irqs(dsi, s);
return 0;
 }
 #endif
 
-static void dsi_dump_dsi_regs(struct dsi_data *dsi, struct seq_file *s)
+static int dsi_dump_dsi_regs(struct seq_file *s, void *p)
 {
-#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(dsi, r))
+   struct dsi_data *dsi = p;
 
if (dsi_runtime_get(dsi))
-   return;
+   return 0;
dsi_enable_scp_clk(dsi);
 
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(dsi, r))
DUMPREG(DSI_REVISION);
DUMPREG(DSI_SYSCONFIG);
DUMPREG(DSI_SYSSTATUS);
@@ -1699,25 +1687,11 @@ static void dsi_dump_dsi_regs(struct dsi_data *dsi, 
struct seq_file *s)
DUMPREG(DSI_PLL_GO);
DUMPREG(DSI_PLL_CONFIGURATION1);
DUMPREG(DSI_PLL_CONFIGURATION2);
+#undef DUMPREG
 
dsi_disable_scp_clk(dsi);
dsi_runtime_put(dsi);
-#undef DUMPREG
-}
-
-static int dsi1_dump_regs(struct seq_file *s, void *p)
-{
-   struct dsi_data *dsi = dsi_get_dsi_from_id(0);
 
-   dsi_dump_dsi_regs(dsi, s);
-   return 0;
-}
-
-static int dsi2_dump_regs(struct seq_file *s, void *p)
-{
-   struct dsi_data *dsi = dsi_get_dsi_from_id(1);
-
-   dsi_dump_dsi_regs(dsi, s);
return 0;
 }
 
@@ -5305,6 +5279,7 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
struct dsi_data *dsi;
struct resource *dsi_mem;
struct resource *res;
+   char name[10];
 
dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
if (!dsi)
@@ -5443,23 +5418,13 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
 
dsi_runtime_put(dsi);
 
-   if (dsi->module_id == 0)
-   dsi->debugfs.regs = dss_debugfs_create_file(dss, "dsi1_regs",
-   dsi1_dump_regs,
-   );
-   else
-   dsi->debugfs.regs = dss_debugfs_create_file(dss, "dsi2_regs",
-   dsi2_dump_regs,
-   );
+   snprintf(name, sizeof(name), "dsi%u_regs", dsi->module_id + 1);
+   dsi->debugfs.regs = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_regs, );
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
-   if (dsi->module_id == 0)
-   dsi->debugfs.irqs = dss_debugfs_create_file(dss, "dsi1_irqs",
-   dsi1_dump_irqs,
-   );
-   else
-   dsi->debugfs.irqs = dss_debugfs_create_file(dss, "dsi2_irqs",
-   dsi2_dump_irqs,
-   );
+   snprintf(name, sizeof(name), "dsi%u_irqs", dsi->module_id + 1);
+   dsi->debugfs.irqs = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_irqs, );
 #endif
 
return 0;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 25/60] drm/omap: Move DSI debugfs clocks dump to dsi%u_clks files

[Laurent Pinchart]

The DSI clocks are dumped in the DSS-level debugfs clocks file. This
complicates the implementation as the DSI private data has to be looked
up through the outputs list. Simplify it by creating two debugfs files,
dsi1_clks and dsi2_clks, to dump the DSI clocks.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 43 ---
 drivers/gpu/drm/omapdrm/dss/dss.c |  3 ---
 drivers/gpu/drm/omapdrm/dss/dss.h |  2 --
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c 
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 9952803b58d2..adfda2a63ada 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -403,6 +403,7 @@ struct dsi_data {
struct {
struct dss_debugfs_entry *irqs;
struct dss_debugfs_entry *regs;
+   struct dss_debugfs_entry *clks;
} debugfs;
 
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
@@ -442,27 +443,6 @@ static inline struct dsi_data *to_dsi_data(struct 
omap_dss_device *dssdev)
return dev_get_drvdata(dssdev->dev);
 }
 
-static struct dsi_data *dsi_get_dsi_from_id(int module)
-{
-   struct omap_dss_device *out;
-   enum omap_dss_output_id id;
-
-   switch (module) {
-   case 0:
-   id = OMAP_DSS_OUTPUT_DSI1;
-   break;
-   case 1:
-   id = OMAP_DSS_OUTPUT_DSI2;
-   break;
-   default:
-   return NULL;
-   }
-
-   out = omap_dss_get_output(id);
-
-   return out ? to_dsi_data(out) : NULL;
-}
-
 static inline void dsi_write_reg(struct dsi_data *dsi,
 const struct dsi_reg idx, u32 val)
 {
@@ -1448,8 +1428,9 @@ static void dsi_pll_disable(struct dss_pll *pll)
dsi_pll_uninit(dsi, true);
 }
 
-static void dsi_dump_dsi_clocks(struct dsi_data *dsi, struct seq_file *s)
+static int dsi_dump_dsi_clocks(struct seq_file *s, void *p)
 {
+   struct dsi_data *dsi = p;
struct dss_pll_clock_info *cinfo = >pll.cinfo;
enum dss_clk_source dispc_clk_src, dsi_clk_src;
int dsi_module = dsi->module_id;
@@ -1459,7 +1440,7 @@ static void dsi_dump_dsi_clocks(struct dsi_data *dsi, 
struct seq_file *s)
dsi_clk_src = dss_get_dsi_clk_source(dsi->dss, dsi_module);
 
if (dsi_runtime_get(dsi))
-   return;
+   return 0;
 
seq_printf(s,   "- DSI%d PLL -\n", dsi_module + 1);
 
@@ -1503,18 +1484,8 @@ static void dsi_dump_dsi_clocks(struct dsi_data *dsi, 
struct seq_file *s)
seq_printf(s,   "LP_CLK\t\t%lu\n", dsi->current_lp_cinfo.lp_clk);
 
dsi_runtime_put(dsi);
-}
-
-void dsi_dump_clocks(struct seq_file *s)
-{
-   struct dsi_data *dsi;
-   int i;
 
-   for  (i = 0; i < MAX_NUM_DSI; i++) {
-   dsi = dsi_get_dsi_from_id(i);
-   if (dsi)
-   dsi_dump_dsi_clocks(dsi, s);
-   }
+   return 0;
 }
 
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
@@ -5426,6 +5397,9 @@ static int dsi_bind(struct device *dev, struct device 
*master, void *data)
dsi->debugfs.irqs = dss_debugfs_create_file(dss, name,
dsi_dump_dsi_irqs, );
 #endif
+   snprintf(name, sizeof(name), "dsi%u_clks", dsi->module_id + 1);
+   dsi->debugfs.clks = dss_debugfs_create_file(dss, name,
+   dsi_dump_dsi_clocks, );
 
return 0;
 
@@ -5442,6 +5416,7 @@ static void dsi_unbind(struct device *dev, struct device 
*master, void *data)
 {
struct dsi_data *dsi = dev_get_drvdata(dev);
 
+   dss_debugfs_remove_file(dsi->debugfs.clks);
dss_debugfs_remove_file(dsi->debugfs.irqs);
dss_debugfs_remove_file(dsi->debugfs.regs);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index 59b238f03437..8e7646181302 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -394,9 +394,6 @@ static int dss_debug_dump_clocks(struct seq_file *s, void 
*p)
 
dss_dump_clocks(dss, s);
dispc_dump_clocks(dss->dispc, s);
-#ifdef CONFIG_OMAP2_DSS_DSI
-   dsi_dump_clocks(s);
-#endif
return 0;
 }
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h 
b/drivers/gpu/drm/omapdrm/dss/dss.h
index 4f1eb7f5b922..a4514843e925 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -373,8 +373,6 @@ static inline void sdi_uninit_port(struct device_node *port)
 
 #ifdef CONFIG_OMAP2_DSS_DSI
 
-void dsi_dump_clocks(struct seq_file *s);
-
 void dsi_irq_handler(void);
 
 #endif
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 23/60] drm/omap: displays: Remove input omap_dss_device from panel data

[Laurent Pinchart]

All connectors, encoders and panels store a pointer to their input
omap_dss_device in the panel driver data structure. This duplicates the
src field in the omap_dss_device structure. Remove the private copy and
use the src field.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  41 ++---
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |  43 ++---
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |  88 +-
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |  41 ++---
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  41 ++---
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  68 +++-
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   |  44 +++--
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c| 190 ++---
 .../omapdrm/displays/panel-lgphilips-lb035q02.c|  41 ++---
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c|  42 ++---
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |  42 ++---
 .../drm/omapdrm/displays/panel-sony-acx565akm.c|  42 ++---
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c|  42 ++---
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c|  44 +++--
 14 files changed, 362 insertions(+), 447 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index d77e21fc26ad..f579bd9ce7cb 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -18,7 +18,6 @@
 
 struct panel_drv_data {
struct omap_dss_device dssdev;
-   struct omap_dss_device *in;
 
struct device *dev;
 
@@ -45,40 +44,37 @@ static const struct videomode tvc_pal_vm = {
 static int tvc_connect(struct omap_dss_device *dssdev)
 {
struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in;
+   struct omap_dss_device *src;
int r;
 
-   in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
-   if (IS_ERR(in)) {
+   src = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
+   if (IS_ERR(src)) {
dev_err(ddata->dev, "failed to find video source\n");
-   return PTR_ERR(in);
+   return PTR_ERR(src);
}
 
-   r = omapdss_device_connect(in, dssdev);
+   r = omapdss_device_connect(src, dssdev);
if (r) {
-   omap_dss_put_device(in);
+   omap_dss_put_device(src);
return r;
}
 
-   ddata->in = in;
return 0;
 }
 
 static void tvc_disconnect(struct omap_dss_device *dssdev)
 {
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
+   struct omap_dss_device *src = dssdev->src;
 
-   omapdss_device_disconnect(in, dssdev);
+   omapdss_device_disconnect(src, dssdev);
 
-   omap_dss_put_device(in);
-   ddata->in = NULL;
+   omap_dss_put_device(src);
 }
 
 static int tvc_enable(struct omap_dss_device *dssdev)
 {
struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
+   struct omap_dss_device *src = dssdev->src;
int r;
 
dev_dbg(ddata->dev, "enable\n");
@@ -89,9 +85,9 @@ static int tvc_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev))
return 0;
 
-   in->ops->set_timings(in, >vm);
+   src->ops->set_timings(src, >vm);
 
-   r = in->ops->enable(in);
+   r = src->ops->enable(src);
if (r)
return r;
 
@@ -103,14 +99,14 @@ static int tvc_enable(struct omap_dss_device *dssdev)
 static void tvc_disable(struct omap_dss_device *dssdev)
 {
struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
+   struct omap_dss_device *src = dssdev->src;
 
dev_dbg(ddata->dev, "disable\n");
 
if (!omapdss_device_is_enabled(dssdev))
return;
 
-   in->ops->disable(in);
+   src->ops->disable(src);
 
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
@@ -119,11 +115,11 @@ static void tvc_set_timings(struct omap_dss_device 
*dssdev,
struct videomode *vm)
 {
struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
+   struct omap_dss_device *src = dssdev->src;
 
ddata->vm = *vm;
 
-   in->ops->set_timings(in, vm);
+   src->ops->set_timings(src, vm);
 }
 
 static void tvc_get_timings(struct omap_dss_device *dssdev,
@@ -137,10 +133,9 @@ static void tvc_get_timings(struct omap_dss_device *dssdev,
 static int tvc_check_timings(struct omap_dss_device *dssdev,
 struct videomode *vm)
 {
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
+   struct 

[PATCH v2 20/60] drm/omap: dss: Add functions to connect and disconnect devices

[Laurent Pinchart]

The omap_dss_device objects model display components and are connected
at runtime to create display pipelines. The connect and disconnect
operations implemented by each component contain lots of duplicate code.
As a first step towards fixing this, create new functions to wrap the
direct calls to those operations and use them.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c   |  4 ++--
 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|  4 ++--
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c|  4 ++--
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c |  4 ++--
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c |  4 ++--
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c  |  6 +++---
 .../drm/omapdrm/displays/panel-lgphilips-lb035q02.c  |  4 ++--
 .../gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c  |  4 ++--
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c   |  4 ++--
 .../gpu/drm/omapdrm/displays/panel-sony-acx565akm.c  |  4 ++--
 .../gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c  |  4 ++--
 .../gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c  |  4 ++--
 drivers/gpu/drm/omapdrm/dss/base.c   | 20 
 drivers/gpu/drm/omapdrm/dss/omapdss.h|  4 
 drivers/gpu/drm/omapdrm/omap_drv.c   |  4 ++--
 17 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index a94868d9398b..41ba3c5dbe7d 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -59,7 +59,7 @@ static int tvc_connect(struct omap_dss_device *dssdev)
return PTR_ERR(in);
}
 
-   r = in->ops->connect(in, dssdev);
+   r = omapdss_device_connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -79,7 +79,7 @@ static void tvc_disconnect(struct omap_dss_device *dssdev)
if (!omapdss_device_is_connected(dssdev))
return;
 
-   in->ops->disconnect(in, dssdev);
+   omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
ddata->in = NULL;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 021e3b651c89..f193bbda550c 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -72,7 +72,7 @@ static int dvic_connect(struct omap_dss_device *dssdev)
return PTR_ERR(in);
}
 
-   r = in->ops->connect(in, dssdev);
+   r = omapdss_device_connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -90,7 +90,7 @@ static void dvic_disconnect(struct omap_dss_device *dssdev)
if (!omapdss_device_is_connected(dssdev))
return;
 
-   in->ops->disconnect(in, dssdev);
+   omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
ddata->in = NULL;
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index b528bd51ada3..014554afbb0d 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -69,7 +69,7 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
return PTR_ERR(in);
}
 
-   r = in->ops->connect(in, dssdev);
+   r = omapdss_device_connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -89,7 +89,7 @@ static void hdmic_disconnect(struct omap_dss_device *dssdev)
if (!omapdss_device_is_connected(dssdev))
return;
 
-   in->ops->disconnect(in, dssdev);
+   omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
ddata->in = NULL;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 37982ffe0ad4..752b565987c1 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -50,7 +50,7 @@ static int opa362_connect(struct omap_dss_device *dssdev,
return PTR_ERR(in);
}
 
-   r = in->ops->connect(in, dssdev);
+   r = omapdss_device_connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -82,7 +82,7 @@ static void opa362_disconnect(struct omap_dss_device *dssdev,
dst->src = NULL;
dssdev->dst = NULL;
 
-   in->ops->disconnect(in, >dssdev);
+   omapdss_device_disconnect(in, >dssdev);
 

[PATCH v2 09/60] drm/omap: dss: Remove DSS encoders get_timings operation

[Laurent Pinchart]

The get_timings operation from DSS encoders (not to be confused with the
identically named operation in omap_dss_driver) is never called. Remove
it.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c| 11 ---
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c|  9 -
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c |  9 -
 drivers/gpu/drm/omapdrm/dss/dpi.c| 13 -
 drivers/gpu/drm/omapdrm/dss/hdmi4.c  |  9 -
 drivers/gpu/drm/omapdrm/dss/hdmi5.c  |  9 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h| 10 --
 drivers/gpu/drm/omapdrm/dss/sdi.c|  9 -
 drivers/gpu/drm/omapdrm/dss/venc.c   | 13 -
 9 files changed, 92 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index afee1b8b457a..27d63a14efe3 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -148,16 +148,6 @@ static void opa362_set_timings(struct omap_dss_device 
*dssdev,
in->ops.atv->set_timings(in, vm);
 }
 
-static void opa362_get_timings(struct omap_dss_device *dssdev,
-  struct videomode *vm)
-{
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-
-   dev_dbg(dssdev->dev, "get_timings\n");
-
-   *vm = ddata->vm;
-}
-
 static int opa362_check_timings(struct omap_dss_device *dssdev,
struct videomode *vm)
 {
@@ -178,7 +168,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = {
 
.check_timings  = opa362_check_timings,
.set_timings= opa362_set_timings,
-   .get_timings= opa362_get_timings,
 };
 
 static int opa362_probe(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index ed7ae384c3ed..566c63a3ad59 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -142,14 +142,6 @@ static void tfp410_set_timings(struct omap_dss_device 
*dssdev,
in->ops.dpi->set_timings(in, vm);
 }
 
-static void tfp410_get_timings(struct omap_dss_device *dssdev,
-  struct videomode *vm)
-{
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-
-   *vm = ddata->vm;
-}
-
 static int tfp410_check_timings(struct omap_dss_device *dssdev,
struct videomode *vm)
 {
@@ -170,7 +162,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = {
 
.check_timings  = tfp410_check_timings,
.set_timings= tfp410_set_timings,
-   .get_timings= tfp410_get_timings,
 };
 
 static int tfp410_probe_of(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index d275bf152da5..4753e5455f82 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -136,14 +136,6 @@ static void tpd_set_timings(struct omap_dss_device *dssdev,
in->ops.hdmi->set_timings(in, vm);
 }
 
-static void tpd_get_timings(struct omap_dss_device *dssdev,
-   struct videomode *vm)
-{
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-
-   *vm = ddata->vm;
-}
-
 static int tpd_check_timings(struct omap_dss_device *dssdev,
 struct videomode *vm)
 {
@@ -249,7 +241,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
 
.check_timings  = tpd_check_timings,
.set_timings= tpd_set_timings,
-   .get_timings= tpd_get_timings,
 
.read_edid  = tpd_read_edid,
.detect = tpd_detect,
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 3d662e6805eb..af002c57a41d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -491,18 +491,6 @@ static void dpi_set_timings(struct omap_dss_device *dssdev,
mutex_unlock(>lock);
 }
 
-static void dpi_get_timings(struct omap_dss_device *dssdev,
-   struct videomode *vm)
-{
-   struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
-
-   mutex_lock(>lock);
-
-   *vm = dpi->vm;
-
-   mutex_unlock(>lock);
-}
-
 static int dpi_check_timings(struct omap_dss_device *dssdev,
 struct videomode *vm)
 {
@@ -702,7 +690,6 @@ static const struct omapdss_dpi_ops dpi_ops = {
 
.check_timings = dpi_check_timings,
.set_timings = dpi_set_timings,
-   .get_timings = dpi_get_timings,
 };
 
 static void dpi_init_output_port(struct dpi_data *dpi, struct 

[PATCH v2 08/60] drm/omap: dss: Remove omapdss_atv_ops get_wss and set_wss operations

[Laurent Pinchart]

The operations are never used, remove them. If the need to set wide
screen signaling data arises later, it should be implemented by
extending the DRM bridge API.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 19 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h  |  6 
 drivers/gpu/drm/omapdrm/dss/venc.c | 41 --
 3 files changed, 66 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 9eabd7201a12..5fdecc12b608 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -154,22 +154,6 @@ static int tvc_check_timings(struct omap_dss_device 
*dssdev,
return in->ops.atv->check_timings(in, vm);
 }
 
-static u32 tvc_get_wss(struct omap_dss_device *dssdev)
-{
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
-
-   return in->ops.atv->get_wss(in);
-}
-
-static int tvc_set_wss(struct omap_dss_device *dssdev, u32 wss)
-{
-   struct panel_drv_data *ddata = to_panel_data(dssdev);
-   struct omap_dss_device *in = ddata->in;
-
-   return in->ops.atv->set_wss(in, wss);
-}
-
 static struct omap_dss_driver tvc_driver = {
.connect= tvc_connect,
.disconnect = tvc_disconnect,
@@ -180,9 +164,6 @@ static struct omap_dss_driver tvc_driver = {
.set_timings= tvc_set_timings,
.get_timings= tvc_get_timings,
.check_timings  = tvc_check_timings,
-
-   .get_wss= tvc_get_wss,
-   .set_wss= tvc_set_wss,
 };
 
 static int tvc_probe(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 8d530057a4b9..67db0ea272f3 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -362,9 +362,6 @@ struct omapdss_atv_ops {
struct videomode *vm);
void (*get_timings)(struct omap_dss_device *dssdev,
struct videomode *vm);
-
-   int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
-   u32 (*get_wss)(struct omap_dss_device *dssdev);
 };
 
 struct omapdss_hdmi_ops {
@@ -554,9 +551,6 @@ struct omap_dss_driver {
void (*get_size)(struct omap_dss_device *dssdev,
 unsigned int *width, unsigned int *height);
 
-   int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
-   u32 (*get_wss)(struct omap_dss_device *dssdev);
-
int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
bool (*detect)(struct omap_dss_device *dssdev);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c 
b/drivers/gpu/drm/omapdrm/dss/venc.c
index 24d1ced210bd..3f4b8a181d74 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -626,44 +626,6 @@ static void venc_get_timings(struct omap_dss_device 
*dssdev,
mutex_unlock(>venc_lock);
 }
 
-static u32 venc_get_wss(struct omap_dss_device *dssdev)
-{
-   struct venc_device *venc = dssdev_to_venc(dssdev);
-
-   /* Invert due to VENC_L21_WC_CTL:INV=1 */
-   return (venc->wss_data >> 8) ^ 0xf;
-}
-
-static int venc_set_wss(struct omap_dss_device *dssdev, u32 wss)
-{
-   struct venc_device *venc = dssdev_to_venc(dssdev);
-   const struct venc_config *config;
-   int r;
-
-   DSSDBG("venc_set_wss\n");
-
-   mutex_lock(>venc_lock);
-
-   config = venc_timings_to_config(>vm);
-
-   /* Invert due to VENC_L21_WC_CTL:INV=1 */
-   venc->wss_data = (wss ^ 0xf) << 8;
-
-   r = venc_runtime_get(venc);
-   if (r)
-   goto err;
-
-   venc_write_reg(venc, VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
-  venc->wss_data);
-
-   venc_runtime_put(venc);
-
-err:
-   mutex_unlock(>venc_lock);
-
-   return r;
-}
-
 static int venc_init_regulator(struct venc_device *venc)
 {
struct regulator *vdda_dac;
@@ -810,9 +772,6 @@ static const struct omapdss_atv_ops venc_ops = {
.check_timings = venc_check_timings,
.set_timings = venc_set_timings,
.get_timings = venc_get_timings,
-
-   .set_wss = venc_set_wss,
-   .get_wss = venc_get_wss,
 };
 
 static void venc_init_output(struct venc_device *venc)
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 19/60] drm/omap: dss: Move common device operations to common structure

[Laurent Pinchart]

The various types of omapdss_*_ops structures define multiple operations
that are not specific to a bus type. To simplify the code and remove
dependencies on specific bus types move those operations to a common
structure. Operations that are specific to a bus type are kept in the
specialized ops structures.

Signed-off-by: Laurent Pinchart 
---
 .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  14 +--
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |  14 +--
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |  42 
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |  20 ++--
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |  20 ++--
 .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  48 -
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c   |  16 +--
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c| 120 ++---
 .../omapdrm/displays/panel-lgphilips-lb035q02.c|  14 +--
 .../drm/omapdrm/displays/panel-nec-nl8048hl11.c|  14 +--
 .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |  14 +--
 .../drm/omapdrm/displays/panel-sony-acx565akm.c|  14 +--
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c|  14 +--
 .../drm/omapdrm/displays/panel-tpo-td043mtea1.c|  16 +--
 drivers/gpu/drm/omapdrm/dss/dpi.c  |   4 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c  |  50 -
 drivers/gpu/drm/omapdrm/dss/hdmi4.c|  14 +--
 drivers/gpu/drm/omapdrm/dss/hdmi5.c|  12 ++-
 drivers/gpu/drm/omapdrm/dss/omapdss.h  | 109 ---
 drivers/gpu/drm/omapdrm/dss/sdi.c  |   4 +-
 drivers/gpu/drm/omapdrm/dss/venc.c |   4 +-
 21 files changed, 256 insertions(+), 321 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 6b640ede6614..a94868d9398b 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -59,7 +59,7 @@ static int tvc_connect(struct omap_dss_device *dssdev)
return PTR_ERR(in);
}
 
-   r = in->ops.atv->connect(in, dssdev);
+   r = in->ops->connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -79,7 +79,7 @@ static void tvc_disconnect(struct omap_dss_device *dssdev)
if (!omapdss_device_is_connected(dssdev))
return;
 
-   in->ops.atv->disconnect(in, dssdev);
+   in->ops->disconnect(in, dssdev);
 
omap_dss_put_device(in);
ddata->in = NULL;
@@ -99,9 +99,9 @@ static int tvc_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev))
return 0;
 
-   in->ops.atv->set_timings(in, >vm);
+   in->ops->set_timings(in, >vm);
 
-   r = in->ops.atv->enable(in);
+   r = in->ops->enable(in);
if (r)
return r;
 
@@ -120,7 +120,7 @@ static void tvc_disable(struct omap_dss_device *dssdev)
if (!omapdss_device_is_enabled(dssdev))
return;
 
-   in->ops.atv->disable(in);
+   in->ops->disable(in);
 
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
@@ -133,7 +133,7 @@ static void tvc_set_timings(struct omap_dss_device *dssdev,
 
ddata->vm = *vm;
 
-   in->ops.atv->set_timings(in, vm);
+   in->ops->set_timings(in, vm);
 }
 
 static void tvc_get_timings(struct omap_dss_device *dssdev,
@@ -150,7 +150,7 @@ static int tvc_check_timings(struct omap_dss_device *dssdev,
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   return in->ops.atv->check_timings(in, vm);
+   return in->ops->check_timings(in, vm);
 }
 
 static const struct omap_dss_driver tvc_driver = {
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 84598ea12a9b..021e3b651c89 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -72,7 +72,7 @@ static int dvic_connect(struct omap_dss_device *dssdev)
return PTR_ERR(in);
}
 
-   r = in->ops.dvi->connect(in, dssdev);
+   r = in->ops->connect(in, dssdev);
if (r) {
omap_dss_put_device(in);
return r;
@@ -90,7 +90,7 @@ static void dvic_disconnect(struct omap_dss_device *dssdev)
if (!omapdss_device_is_connected(dssdev))
return;
 
-   in->ops.dvi->disconnect(in, dssdev);
+   in->ops->disconnect(in, dssdev);
 
omap_dss_put_device(in);
ddata->in = NULL;
@@ -108,9 +108,9 @@ static int dvic_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev))
return 0;
 
-   in->ops.dvi->set_timings(in, >vm);
+   in->ops->set_timings(in, >vm);
 
-   r = 

[PATCH v2 21/60] drm/omap: dss: Move debug message and checks to connection handlers

[Laurent Pinchart]

The connectors, encoders and display duplicate the same debug messages
and connection checks in their omap_dss_device connect and disconnect
handlers. Move the code to the connect and disconnect wrappers.

To simplify the code the connect function returns -EBUSY unconditionally
if the device is already connected. This doesn't cause any change in
practice: the connect handler of displays is never called on a connected
device as it is only invoked during omapdrm initialization.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c  | 10 --
 drivers/gpu/drm/omapdrm/displays/connector-dvi.c|  6 --
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c   | 10 --
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c   | 11 ---
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c   |  7 ---
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c|  6 --
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c  |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c |  6 --
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c |  6 --
 drivers/gpu/drm/omapdrm/dss/base.c  | 12 
 14 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 41ba3c5dbe7d..d77e21fc26ad 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -48,11 +48,6 @@ static int tvc_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *in;
int r;
 
-   dev_dbg(ddata->dev, "connect\n");
-
-   if (omapdss_device_is_connected(dssdev))
-   return 0;
-
in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
if (IS_ERR(in)) {
dev_err(ddata->dev, "failed to find video source\n");
@@ -74,11 +69,6 @@ static void tvc_disconnect(struct omap_dss_device *dssdev)
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   dev_dbg(ddata->dev, "disconnect\n");
-
-   if (!omapdss_device_is_connected(dssdev))
-   return;
-
omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index f193bbda550c..9a3ecc3ed5b2 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -63,9 +63,6 @@ static int dvic_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *in;
int r;
 
-   if (omapdss_device_is_connected(dssdev))
-   return 0;
-
in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
if (IS_ERR(in)) {
dev_err(dssdev->dev, "failed to find video source\n");
@@ -87,9 +84,6 @@ static void dvic_disconnect(struct omap_dss_device *dssdev)
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   if (!omapdss_device_is_connected(dssdev))
-   return;
-
omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 014554afbb0d..665af9932317 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -58,11 +58,6 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
struct omap_dss_device *in;
int r;
 
-   dev_dbg(ddata->dev, "connect\n");
-
-   if (omapdss_device_is_connected(dssdev))
-   return 0;
-
in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);
if (IS_ERR(in)) {
dev_err(ddata->dev, "failed to find video source\n");
@@ -84,11 +79,6 @@ static void hdmic_disconnect(struct omap_dss_device *dssdev)
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
 
-   dev_dbg(ddata->dev, "disconnect\n");
-
-   if (!omapdss_device_is_connected(dssdev))
-   return;
-
omapdss_device_disconnect(in, dssdev);
 
omap_dss_put_device(in);
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 752b565987c1..5b9ef09e6b2d 100644
--- 

[PATCH v2 18/60] drm/omap: dss: Allow looking up any device by port

[Laurent Pinchart]

The omap_dss_find_output_by_port() function looks up an omap_dss_device
by port from the list of devices registered as outputs. In preparation
for looking up sinks in addition to sources, allow the function to look
up any registered device. Rename it to omap_dss_find_device_by_port() to
match its new purpose.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 13 +
 drivers/gpu/drm/omapdrm/dss/dss-of.c  |  2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  4 ++--
 drivers/gpu/drm/omapdrm/dss/output.c  | 13 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 63fe0a717884..df6cb1ac43c8 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -89,6 +89,19 @@ static bool omapdss_device_is_registered(struct device_node 
*node)
return found;
 }
 
+struct omap_dss_device *omapdss_find_device_by_port(struct device_node *src,
+   unsigned int port)
+{
+   struct omap_dss_device *dssdev;
+
+   list_for_each_entry(dssdev, _devices_list, list) {
+   if (dssdev->dev->of_node == src && dssdev->port_num == port)
+   return omap_dss_get_device(dssdev);
+   }
+
+   return NULL;
+}
+
 /* 
-
  * Components Handling
  */
diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c 
b/drivers/gpu/drm/omapdrm/dss/dss-of.c
index b51af09e9111..771b20db2d98 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
@@ -74,7 +74,7 @@ omapdss_of_find_source_for_first_ep(struct device_node *node)
return NULL;
 
/* ... and finally the source. */
-   src = omap_dss_find_output_by_port(src_node, port_number);
+   src = omapdss_find_device_by_port(src_node, port_number);
of_node_put(src_node);
 
return src ? src : ERR_PTR(-EPROBE_DEFER);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index ff0f603bce76..2ec74206bcff 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -563,6 +563,8 @@ void omapdss_unregister_display(struct omap_dss_device 
*dssdev);
 
 void omapdss_device_register(struct omap_dss_device *dssdev);
 void omapdss_device_unregister(struct omap_dss_device *dssdev);
+struct omap_dss_device *omapdss_find_device_by_port(struct device_node *src,
+   unsigned int port);
 
 struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
 void omap_dss_put_device(struct omap_dss_device *dssdev);
@@ -576,8 +578,6 @@ int omap_dss_get_num_overlays(void);
 int omapdss_register_output(struct omap_dss_device *output);
 void omapdss_unregister_output(struct omap_dss_device *output);
 struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id);
-struct omap_dss_device *omap_dss_find_output_by_port(struct device_node *src,
-unsigned int port);
 int omapdss_output_set_device(struct omap_dss_device *out,
struct omap_dss_device *dssdev);
 int omapdss_output_unset_device(struct omap_dss_device *out);
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index be254ea42e08..e659c8e5c419 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -122,19 +122,6 @@ struct omap_dss_device *omap_dss_get_output(enum 
omap_dss_output_id id)
 }
 EXPORT_SYMBOL(omap_dss_get_output);
 
-struct omap_dss_device *omap_dss_find_output_by_port(struct device_node *src,
-unsigned int port)
-{
-   struct omap_dss_device *out;
-
-   list_for_each_entry(out, _list, output_list) {
-   if (out->dev->of_node == src && out->port_num == port)
-   return omap_dss_get_device(out);
-   }
-
-   return NULL;
-}
-
 struct omap_dss_device *omapdss_find_output_from_display(struct 
omap_dss_device *dssdev)
 {
while (dssdev->src)
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 15/60] drm/omap: dss: Create global list of all omap_dss_device instances

[Laurent Pinchart]

The omap_dss_device instances are stored in two separate lists,
depending on whether they are panels or outputs. Create a third list
that stores all omap_dss_device instances to allow generic code to
operate on all instances.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/base.c| 45 ---
 drivers/gpu/drm/omapdrm/dss/display.c |  4 
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  4 
 drivers/gpu/drm/omapdrm/dss/output.c  |  2 ++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c 
b/drivers/gpu/drm/omapdrm/dss/base.c
index 99e8cb8dc65b..18b72d7c717a 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -14,24 +14,17 @@
  */
 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 #include "dss.h"
 #include "omapdss.h"
 
 static struct dss_device *dss_device;
 
-static struct list_head omapdss_comp_list;
-
-struct omapdss_comp_node {
-   struct list_head list;
-   struct device_node *node;
-   bool dss_core_component;
-};
-
 struct dss_device *omapdss_get_dss(void)
 {
return dss_device;
@@ -56,6 +49,40 @@ const struct dispc_ops *dispc_get_ops(struct dss_device *dss)
 }
 EXPORT_SYMBOL(dispc_get_ops);
 
+
+/* 
-
+ * OMAP DSS Devices Handling
+ */
+
+static LIST_HEAD(omapdss_devices_list);
+static DEFINE_MUTEX(omapdss_devices_lock);
+
+void omapdss_device_register(struct omap_dss_device *dssdev)
+{
+   mutex_lock(_devices_lock);
+   list_add_tail(>list, _devices_list);
+   mutex_unlock(_devices_lock);
+}
+
+void omapdss_device_unregister(struct omap_dss_device *dssdev)
+{
+   mutex_lock(_devices_lock);
+   list_del(>list);
+   mutex_unlock(_devices_lock);
+}
+
+/* 
-
+ * Components Handling
+ */
+
+static struct list_head omapdss_comp_list;
+
+struct omapdss_comp_node {
+   struct list_head list;
+   struct device_node *node;
+   bool dss_core_component;
+};
+
 static bool omapdss_list_contains(const struct device_node *node)
 {
struct omapdss_comp_node *comp;
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index e07e3319d6e0..eacbbf45f737 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -56,6 +56,8 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
mutex_lock(_list_mutex);
list_add_tail(>panel_list, _list);
mutex_unlock(_list_mutex);
+
+   omapdss_device_register(dssdev);
return 0;
 }
 EXPORT_SYMBOL(omapdss_register_display);
@@ -65,6 +67,8 @@ void omapdss_unregister_display(struct omap_dss_device 
*dssdev)
mutex_lock(_list_mutex);
list_del(>panel_list);
mutex_unlock(_list_mutex);
+
+   omapdss_device_register(dssdev);
 }
 EXPORT_SYMBOL(omapdss_unregister_display);
 
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index abf101bb27ea..e029613509a1 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -450,6 +450,7 @@ struct omap_dss_device {
 
struct module *owner;
 
+   struct list_head list;
struct list_head panel_list;
 
unsigned int alias_id;
@@ -560,6 +561,9 @@ static inline bool omapdss_is_initialized(void)
 int omapdss_register_display(struct omap_dss_device *dssdev);
 void omapdss_unregister_display(struct omap_dss_device *dssdev);
 
+void omapdss_device_register(struct omap_dss_device *dssdev);
+void omapdss_device_unregister(struct omap_dss_device *dssdev);
+
 struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
 void omap_dss_put_device(struct omap_dss_device *dssdev);
 #define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 0fcd13ea8824..1a2d24906edd 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -97,6 +97,7 @@ EXPORT_SYMBOL(omapdss_output_unset_device);
 int omapdss_register_output(struct omap_dss_device *out)
 {
list_add_tail(>output_list, _list);
+   omapdss_device_register(out);
return 0;
 }
 EXPORT_SYMBOL(omapdss_register_output);
@@ -104,6 +105,7 @@ EXPORT_SYMBOL(omapdss_register_output);
 void omapdss_unregister_output(struct omap_dss_device *out)
 {
list_del(>output_list);
+   omapdss_device_unregister(out);
 }
 EXPORT_SYMBOL(omapdss_unregister_output);
 
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 14/60] drm/omap: dss: Rename omap_dss_device list field to output_list

[Laurent Pinchart]

For coherency with the panel_list field, rename list to output_list.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  2 +-
 drivers/gpu/drm/omapdrm/dss/output.c  | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 39e2906fd5fe..abf101bb27ea 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -481,7 +481,7 @@ struct omap_dss_device {
 
/* OMAP DSS output specific fields */
 
-   struct list_head list;
+   struct list_head output_list;
 
/* DISPC channel for this output */
enum omap_channel dispc_channel;
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 96b9d4cd505f..0fcd13ea8824 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -96,14 +96,14 @@ EXPORT_SYMBOL(omapdss_output_unset_device);
 
 int omapdss_register_output(struct omap_dss_device *out)
 {
-   list_add_tail(>list, _list);
+   list_add_tail(>output_list, _list);
return 0;
 }
 EXPORT_SYMBOL(omapdss_register_output);
 
 void omapdss_unregister_output(struct omap_dss_device *out)
 {
-   list_del(>list);
+   list_del(>output_list);
 }
 EXPORT_SYMBOL(omapdss_unregister_output);
 
@@ -111,7 +111,7 @@ bool omapdss_component_is_output(struct device_node *node)
 {
struct omap_dss_device *out;
 
-   list_for_each_entry(out, _list, list) {
+   list_for_each_entry(out, _list, output_list) {
if (out->dev->of_node == node)
return true;
}
@@ -124,7 +124,7 @@ struct omap_dss_device *omap_dss_get_output(enum 
omap_dss_output_id id)
 {
struct omap_dss_device *out;
 
-   list_for_each_entry(out, _list, list) {
+   list_for_each_entry(out, _list, output_list) {
if (out->id == id)
return out;
}
@@ -145,7 +145,7 @@ struct omap_dss_device 
*omap_dss_find_output_by_port_node(struct device_node *po
 
reg = dss_of_port_get_port_number(port);
 
-   list_for_each_entry(out, _list, list) {
+   list_for_each_entry(out, _list, output_list) {
if (out->dev->of_node == src_node && out->port_num == reg) {
of_node_put(src_node);
return omap_dss_get_device(out);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 00/60] omapdrm: Reverse direction of DSS device (dis)connect operations

[Laurent Pinchart]

Hello,

This patch series is a first step towards moving the omapdrm driver away from
the custom bridge and panel drivers to drm_bridge and drm_panel.

The main blocker to transition to drm_bridge and drm_panel is the direction of
the bridge operations. While the omapdrm driver manages its components from
sink to source (panel to DSS output), the drm_bridge API is manages bridges in
the source to sink direction. This makes the two models incompatible, and
requires reversing the direction of operations inside omapdrm.

Don't rejoice too fast, we're still far from a complete transition, but this
first step paves the way by reworking the driver's internals to make source to
sink order possible. It then transitions the connect and disconnect operations
(the omapdrm equivalent of the drm_bridge attach and detach operations) to the
new direction.

The series contains patches previously posted by Jyri and Peter that I have
found helpful. Please see the individual patches for changes compared to the
original versions (trivial conflict resolutions caused by a rebase are not
mentioned).

The patches are based on top of the "[PATCH v2 0/6] omapdrm: struct_mutex
removal" patch series I've sent yesterday, itself based on top of Dave's
drm-next branch. They can be found at

git://linuxtv.org/pinchartl/media.git omapdrm/bridge

The series has been tested on a Pandaboard with the HDMI and DVI outputs, and
on a TI AM57xx EVM with the LCD and HDMI outputs. All patches have been tested
individually on the Pandaboard.

Compared to v1, patch "drm/omap: dss: Remove omapdss_hdmi_ops set_infoframe
operation" has been dropped, and patch "drm/omap: dss: Handle DPI and SDI port
initialization failures" added. Other small changes are documented in
individual patches.

Jyri Sarha (1):
  drm/omap: dss: Move platform_device_register from core.c to dss.c
probe

Laurent Pinchart (55):
  drm/omap: dss: Gather OMAP DSS components at probe time
  drm/omap: dss: Handle DPI and SDI port initialization failures
  drm/omap: dss: Remove omapdss_atv_ops get_wss and set_wss operations
  drm/omap: dss: Remove DSS encoders get_timings operation
  drm/omap: dss: Remove unused omapdss_default_get_timings()
  drm/omap: dss: Constify omap_dss_driver operations structure
  drm/omap: displays: Remove videomode from omap_dss_device structure
  drm/omap: dss: Remove omap_dss_device panel fields
  drm/omap: dss: Rename omap_dss_device list field to output_list
  drm/omap: dss: Create global list of all omap_dss_device instances
  drm/omap: dss: Create and use omapdss_device_is_registered()
  drm/omap: dss: Rework output lookup by port node
  drm/omap: dss: Allow looking up any device by port
  drm/omap: dss: Move common device operations to common structure
  drm/omap: dss: Add functions to connect and disconnect devices
  drm/omap: dss: Move debug message and checks to connection handlers
  drm/omap: dss: Move src and dst check and set to connection handlers
  drm/omap: displays: Remove input omap_dss_device from panel data
  drm/omap: dsi: Simplify debugfs implementation
  drm/omap: Move DSI debugfs clocks dump to dsi%u_clks files
  drm/omap: dss: Remove output devices list
  drm/omap: dss: Rename for_each_dss_dev macro to for_each_dss_display
  drm/omap: dss: Make omap_dss_get_next_device() more generic
  drm/omap: dss: Split omapdss_register_display()
  drm/omap: dss: Remove panel devices list
  drm/omap: dss: Move and rename omap_dss_(get|put)_device()
  drm/omap: dss: Store dss_device pointer in omap_dss_device
  drm/omap: dss: Move DSS mgr ops and private data to dss_device
  drm/omap: dss: Modify omapdss_find_output_from_display() to return
channel
  drm/omap: dss: Replace omap_dss_device port number with bitmask
  drm/omap: dss: Extend omapdss_of_find_source_for_first_ep() to sinks
  drm/omap: displays: Don't cast dssdev to panel data unnecessarily
  drm/omap: dss: Cleanup error paths in output init functions
  drm/omap: dss: dsi: Move initialization code from bind to probe
  drm/omap: dss: hdmi4: Move initialization code from bind to probe
  drm/omap: dss: hdmi5: Move initialization code from bind to probe
  drm/omap: dss: venc: Move initialization code from bind to probe
  drm/omap: dss: Acquire next dssdev at probe time
  drm/omap: dss: Add for_each_dss_output() macro
  drm/omap: dss: Add function to retrieve display for an output
  drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect()
  drm/omap: dss: Get regulators at probe time
  drm/omap: Remove unneeded variable assignments in omap_modeset_init
  drm/omap: Create all planes before CRTCs
  drm/omap: Group CRTC, encoder, connector and dssdev in a structure
  drm/omap: Reverse direction of DSS device (dis)connect operations
  drm/omap: dss: Move connection checks to omapdss_device_(dis)connect
  drm/omap: dss: Move display type validation to initialization time
  drm/omap: dss: Merge two disconnection helpers
  drm/omap: Pass pipe pointer to omap_crtc_init()
  

[PATCH v2 10/60] drm/omap: dss: Remove unused omapdss_default_get_timings()

[Laurent Pinchart]

All omap_dss_driver instances provide the get_timings operation. Remove
the default function.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/display.c | 10 --
 1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index 25c3be86d7f4..e07e3319d6e0 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -28,19 +28,12 @@
 
 #include "omapdss.h"
 
-static void omapdss_default_get_timings(struct omap_dss_device *dssdev,
-   struct videomode *vm)
-{
-   *vm = dssdev->panel.vm;
-}
-
 static LIST_HEAD(panel_list);
 static DEFINE_MUTEX(panel_list_mutex);
 static int disp_num_counter;
 
 int omapdss_register_display(struct omap_dss_device *dssdev)
 {
-   struct omap_dss_driver *drv = dssdev->driver;
int id;
 
/*
@@ -60,9 +53,6 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
dssdev->name = devm_kasprintf(dssdev->dev, GFP_KERNEL,
  "display%u", id);
 
-   if (drv && drv->get_timings == NULL)
-   drv->get_timings = omapdss_default_get_timings;
-
mutex_lock(_list_mutex);
list_add_tail(>panel_list, _list);
mutex_unlock(_list_mutex);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 02/60] drm/omap: Manage the usable omap_dss_device list within omap_drm_private

[Laurent Pinchart]

From: Peter Ujfalusi 

Instead of reaching back to DSS to iterate through the dss_devices every
time, use an internal array where we store the available and usable
dss_devices.

At the same time remove the omapdss_device_is_connected() check from
omap_modeset_init() as it became irrelevant: We are not adding dssdevs
if their connect failed.

Signed-off-by: Peter Ujfalusi 
Signed-off-by: Tomi Valkeinen 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Laurent Pinchart 
---
Changes since v0:

- Make loop counter unsigned
---
 drivers/gpu/drm/omapdrm/omap_drv.c | 94 --
 drivers/gpu/drm/omapdrm/omap_drv.h |  3 ++
 2 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 244ed3707589..9277aa8c49c0 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -149,18 +149,27 @@ static int get_connector_type(struct omap_dss_device 
*dssdev)
}
 }
 
-static void omap_disconnect_dssdevs(void)
+static void omap_disconnect_dssdevs(struct drm_device *ddev)
 {
-   struct omap_dss_device *dssdev = NULL;
+   struct omap_drm_private *priv = ddev->dev_private;
+   unsigned int i;
+
+   for (i = 0; i < priv->num_dssdevs; i++) {
+   struct omap_dss_device *dssdev = priv->dssdevs[i];
 
-   for_each_dss_dev(dssdev)
dssdev->driver->disconnect(dssdev);
+   priv->dssdevs[i] = NULL;
+   omap_dss_put_device(dssdev);
+   }
+
+   priv->num_dssdevs = 0;
 }
 
-static int omap_connect_dssdevs(void)
+static int omap_connect_dssdevs(struct drm_device *ddev)
 {
-   int r;
+   struct omap_drm_private *priv = ddev->dev_private;
struct omap_dss_device *dssdev = NULL;
+   int r;
 
if (!omapdss_stack_is_ready())
return -EPROBE_DEFER;
@@ -173,6 +182,14 @@ static int omap_connect_dssdevs(void)
} else if (r) {
dev_warn(dssdev->dev, "could not connect display: %s\n",
dssdev->name);
+   } else {
+   omap_dss_get_device(dssdev);
+   priv->dssdevs[priv->num_dssdevs++] = dssdev;
+   if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
+   /* To balance the 'for_each_dss_dev' loop */
+   omap_dss_put_device(dssdev);
+   break;
+   }
}
}
 
@@ -183,7 +200,7 @@ static int omap_connect_dssdevs(void)
 * if we are deferring probe, we disconnect the devices we previously
 * connected
 */
-   omap_disconnect_dssdevs();
+   omap_disconnect_dssdevs(ddev);
 
return r;
 }
@@ -208,6 +225,7 @@ static int omap_modeset_init(struct drm_device *dev)
int num_ovls = priv->dispc_ops->get_num_ovls(priv->dispc);
int num_mgrs = priv->dispc_ops->get_num_mgrs(priv->dispc);
int num_crtcs, crtc_idx, plane_idx;
+   unsigned int i;
int ret;
u32 plane_crtc_mask;
 
@@ -225,11 +243,7 @@ static int omap_modeset_init(struct drm_device *dev)
 * configuration does not match the expectations or exceeds
 * the available resources, the configuration is rejected.
 */
-   num_crtcs = 0;
-   for_each_dss_dev(dssdev)
-   if (omapdss_device_is_connected(dssdev))
-   num_crtcs++;
-
+   num_crtcs = priv->num_dssdevs;
if (num_crtcs > num_mgrs || num_crtcs > num_ovls ||
num_crtcs > ARRAY_SIZE(priv->crtcs) ||
num_crtcs > ARRAY_SIZE(priv->planes) ||
@@ -247,15 +261,13 @@ static int omap_modeset_init(struct drm_device *dev)
 
crtc_idx = 0;
plane_idx = 0;
-   for_each_dss_dev(dssdev) {
+   for (i = 0; i < priv->num_dssdevs; i++) {
+   struct omap_dss_device *dssdev = priv->dssdevs[i];
struct drm_connector *connector;
struct drm_encoder *encoder;
struct drm_plane *plane;
struct drm_crtc *crtc;
 
-   if (!omapdss_device_is_connected(dssdev))
-   continue;
-
encoder = omap_encoder_init(dev, dssdev);
if (!encoder)
return -ENOMEM;
@@ -335,11 +347,14 @@ static int omap_modeset_init(struct drm_device *dev)
 /*
  * Enable the HPD in external components if supported
  */
-static void omap_modeset_enable_external_hpd(void)
+static void omap_modeset_enable_external_hpd(struct drm_device *ddev)
 {
-   struct omap_dss_device *dssdev = NULL;
+   struct omap_drm_private *priv = ddev->dev_private;
+   int i;
+
+   for (i = 0; i < priv->num_dssdevs; i++) {
+

[PATCH v2 03/60] drm/omap: Do dss_device (display) ordering in omap_drv.c

[Laurent Pinchart]

From: Peter Ujfalusi 

Sort the dssdev array based on DT aliases.

With this change we can remove the panel ordering from dss/display.c and
have all sorting related to dssdevs in one place.

Signed-off-by: Peter Ujfalusi 
Signed-off-by: Tomi Valkeinen 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Laurent Pinchart 
---
Changes since v0:

- Make alias_id unsigned
---
 drivers/gpu/drm/omapdrm/dss/display.c |  2 ++
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  1 +
 drivers/gpu/drm/omapdrm/omap_drv.c| 18 ++
 3 files changed, 21 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index 424143128cd4..3ef99f344bd3 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -52,6 +52,8 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
if (id < 0)
id = disp_num_counter++;
 
+   dssdev->alias_id = id;
+
snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id);
 
/* Use 'label' property for name, if it exists */
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 14d74adb13fb..eae105b0b961 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -467,6 +467,7 @@ struct omap_dss_device {
 
/* alias in the form of "display%d" */
char alias[16];
+   unsigned int alias_id;
 
enum omap_display_type type;
enum omap_display_type output_type;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 9277aa8c49c0..e2d7f8bfb4c1 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -15,6 +15,8 @@
  * this program.  If not, see .
  */
 
+#include 
+#include 
 #include 
 
 #include 
@@ -165,6 +167,18 @@ static void omap_disconnect_dssdevs(struct drm_device 
*ddev)
priv->num_dssdevs = 0;
 }
 
+static int omap_compare_dssdevs(const void *a, const void *b)
+{
+   const struct omap_dss_device *dssdev1 = *(struct omap_dss_device **)a;
+   const struct omap_dss_device *dssdev2 = *(struct omap_dss_device **)b;
+
+   if (dssdev1->alias_id > dssdev2->alias_id)
+   return 1;
+   else if (dssdev1->alias_id < dssdev2->alias_id)
+   return -1;
+   return 0;
+}
+
 static int omap_connect_dssdevs(struct drm_device *ddev)
 {
struct omap_drm_private *priv = ddev->dev_private;
@@ -193,6 +207,10 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
}
}
 
+   /* Sort the list by DT aliases */
+   sort(priv->dssdevs, priv->num_dssdevs, sizeof(priv->dssdevs[0]),
+omap_compare_dssdevs, NULL);
+
return 0;
 
 cleanup:
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 01/60] drm/omap: Allocate drm_device earlier and unref it as last step

[Laurent Pinchart]

From: Peter Ujfalusi 

If we allocate the drm_device earlier we can just return the error code
without the need to use goto.
Do the unref of the drm_device as a last step when cleaning up. This will
make the drm_device available longer for us and makes sure that we only
free up the memory when all other cleanups have been already done.

Signed-off-by: Peter Ujfalusi 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Tomi Valkeinen 
Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/omap_drv.c | 29 +
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c 
b/drivers/gpu/drm/omapdrm/omap_drv.c
index 5005ecc284d2..244ed3707589 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -525,6 +525,14 @@ static int omapdrm_init(struct omap_drm_private *priv, 
struct device *dev)
 
DBG("%s", dev_name(dev));
 
+   /* Allocate and initialize the DRM device. */
+   ddev = drm_dev_alloc(_drm_driver, dev);
+   if (IS_ERR(ddev))
+   return PTR_ERR(ddev);
+
+   priv->ddev = ddev;
+   ddev->dev_private = priv;
+
priv->dev = dev;
priv->dss = omapdss_get_dss();
priv->dispc = dispc_get_dispc(priv->dss);
@@ -543,16 +551,6 @@ static int omapdrm_init(struct omap_drm_private *priv, 
struct device *dev)
mutex_init(>list_lock);
INIT_LIST_HEAD(>obj_list);
 
-   /* Allocate and initialize the DRM device. */
-   ddev = drm_dev_alloc(_drm_driver, priv->dev);
-   if (IS_ERR(ddev)) {
-   ret = PTR_ERR(ddev);
-   goto err_destroy_wq;
-   }
-
-   priv->ddev = ddev;
-   ddev->dev_private = priv;
-
/* Get memory bandwidth limits */
if (priv->dispc_ops->get_memory_bandwidth_limit)
priv->max_bandwidth =
@@ -563,7 +561,7 @@ static int omapdrm_init(struct omap_drm_private *priv, 
struct device *dev)
ret = omap_modeset_init(ddev);
if (ret) {
dev_err(priv->dev, "omap_modeset_init failed: ret=%d\n", ret);
-   goto err_free_drm_dev;
+   goto err_gem_deinit;
}
 
/* Initialize vblank handling, start with all CRTCs disabled. */
@@ -599,14 +597,13 @@ static int omapdrm_init(struct omap_drm_private *priv, 
struct device *dev)
 err_cleanup_modeset:
drm_mode_config_cleanup(ddev);
omap_drm_irq_uninstall(ddev);
-err_free_drm_dev:
+err_gem_deinit:
omap_gem_deinit(ddev);
-   drm_dev_unref(ddev);
-err_destroy_wq:
destroy_workqueue(priv->wq);
omap_disconnect_dssdevs();
 err_crtc_uninit:
omap_crtc_pre_uninit();
+   drm_dev_unref(ddev);
return ret;
 }
 
@@ -630,12 +627,12 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)
omap_drm_irq_uninstall(ddev);
omap_gem_deinit(ddev);
 
-   drm_dev_unref(ddev);
-
destroy_workqueue(priv->wq);
 
omap_disconnect_dssdevs();
omap_crtc_pre_uninit();
+
+   drm_dev_unref(ddev);
 }
 
 static int pdev_probe(struct platform_device *pdev)
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 07/60] drm/omap: dss: Handle DPI and SDI port initialization failures

[Laurent Pinchart]

The dpi_init_port() and sdi_init_port() functions can return errors but
their return value is ignored. This prevents both probe failures and
probe deferral from working correctly. Propagate the errors up the call
stack.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dss.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index abd45b08f3a1..59b238f03437 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1183,7 +1183,8 @@ static int dss_init_ports(struct dss_device *dss)
struct platform_device *pdev = dss->pdev;
struct device_node *parent = pdev->dev.of_node;
struct device_node *port;
-   int i;
+   unsigned int i;
+   int r;
 
for (i = 0; i < dss->feat->num_ports; i++) {
port = of_graph_get_port_by_id(parent, i);
@@ -1192,11 +1193,17 @@ static int dss_init_ports(struct dss_device *dss)
 
switch (dss->feat->ports[i]) {
case OMAP_DISPLAY_TYPE_DPI:
-   dpi_init_port(dss, pdev, port, dss->feat->model);
+   r = dpi_init_port(dss, pdev, port, dss->feat->model);
+   if (r)
+   return r;
break;
+
case OMAP_DISPLAY_TYPE_SDI:
-   sdi_init_port(dss, pdev, port);
+   r = sdi_init_port(dss, pdev, port);
+   if (r)
+   return r;
break;
+
default:
break;
}
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 06/60] drm/omap: dss: Move platform_device_register from core.c to dss.c probe

[Laurent Pinchart]

From: Jyri Sarha 

Register the omapdrm device when we know that dss device probe going
to succeed. This avoids DSS6 and DSS2 omapdrm device registration from
colliding with each other.

Signed-off-by: Jyri Sarha 
Signed-off-by: Laurent Pinchart 
---
Changes since v0:

- Store the OMAP DRM platform device pointer in struct dss_device
- Register the OMAP DRM platform device at the very end of dss_bind()
---
 drivers/gpu/drm/omapdrm/dss/core.c | 26 ++
 drivers/gpu/drm/omapdrm/dss/dss.c  | 13 +
 drivers/gpu/drm/omapdrm/dss/dss.h  |  2 ++
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/core.c 
b/drivers/gpu/drm/omapdrm/dss/core.c
index acef7ece5783..6c9f667f9982 100644
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -45,36 +45,14 @@ static struct platform_driver * const omap_dss_drivers[] = {
 #endif
 };
 
-static struct platform_device *omap_drm_device;
-
 static int __init omap_dss_init(void)
 {
-   int r;
-
-   r = platform_register_drivers(omap_dss_drivers,
- ARRAY_SIZE(omap_dss_drivers));
-   if (r)
-   goto err_reg;
-
-   omap_drm_device = platform_device_register_simple("omapdrm", 0, NULL, 
0);
-   if (IS_ERR(omap_drm_device)) {
-   r = PTR_ERR(omap_drm_device);
-   goto err_reg;
-   }
-
-   return 0;
-
-err_reg:
-   platform_unregister_drivers(omap_dss_drivers,
-   ARRAY_SIZE(omap_dss_drivers));
-
-   return r;
+   return platform_register_drivers(omap_dss_drivers,
+ARRAY_SIZE(omap_dss_drivers));
 }
 
 static void __exit omap_dss_exit(void)
 {
-   platform_device_unregister(omap_drm_device);
-
platform_unregister_drivers(omap_dss_drivers,
ARRAY_SIZE(omap_dss_drivers));
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index d27d7f85bcd1..abd45b08f3a1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1315,6 +1315,7 @@ static const struct soc_device_attribute 
dss_soc_devices[] = {
 static int dss_bind(struct device *dev)
 {
struct dss_device *dss = dev_get_drvdata(dev);
+   struct platform_device *drm_pdev;
int r;
 
r = component_bind_all(dev, NULL);
@@ -1325,11 +1326,23 @@ static int dss_bind(struct device *dev)
 
omapdss_set_dss(dss);
 
+   drm_pdev = platform_device_register_simple("omapdrm", 0, NULL, 0);
+   if (IS_ERR(drm_pdev)) {
+   component_unbind_all(dev, NULL);
+   return PTR_ERR(drm_pdev);
+   }
+
+   dss->drm_pdev = drm_pdev;
+
return 0;
 }
 
 static void dss_unbind(struct device *dev)
 {
+   struct dss_device *dss = dev_get_drvdata(dev);
+
+   platform_device_unregister(dss->drm_pdev);
+
omapdss_set_dss(NULL);
 
component_unbind_all(dev, NULL);
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h 
b/drivers/gpu/drm/omapdrm/dss/dss.h
index 847c78ade024..4f1eb7f5b922 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -235,6 +235,8 @@ struct dss_device {
struct regmap   *syscon_pll_ctrl;
u32 syscon_pll_ctrl_offset;
 
+   struct platform_device *drm_pdev;
+
struct clk  *parent_clk;
struct clk  *dss_clk;
unsigned long   dss_clk_rate;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 13/60] drm/omap: dss: Remove omap_dss_device panel fields

[Laurent Pinchart]

The omap_dss_device panel.dsi_pix_fmt and panel.dsi_mode fields are
unused. Remove them.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 -
 drivers/gpu/drm/omapdrm/dss/omapdss.h   | 5 -
 2 files changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c 
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 555ab2ac5576..8d98cd628e11 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1333,7 +1333,6 @@ static int dsicm_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DSI;
dssdev->owner = THIS_MODULE;
 
-   dssdev->panel.dsi_pix_fmt = OMAP_DSS_DSI_FMT_RGB888;
dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
 
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index a93afbbe19de..39e2906fd5fe 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -457,11 +457,6 @@ struct omap_dss_device {
enum omap_display_type type;
enum omap_display_type output_type;
 
-   struct {
-   enum omap_dss_dsi_pixel_format dsi_pix_fmt;
-   enum omap_dss_dsi_mode dsi_mode;
-   } panel;
-
const char *name;
 
const struct omap_dss_driver *driver;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 12/60] drm/omap: displays: Remove videomode from omap_dss_device structure

[Laurent Pinchart]

The omap_dss_device structure stores a videomode. All the connector and
panel drivers that use omap_dss_device also store the videomode in their
own panel_drv_data structures. There's no need to duplicate, remove the
videomode field from omap_dss_device.

Signed-off-by: Laurent Pinchart 
---
 drivers/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/encoder-opa362.c   | 1 -
 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c   | 1 -
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c| 1 -
 drivers/gpu/drm/omapdrm/displays/panel-dpi.c| 2 --
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 8 +++-
 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 --
 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 --
 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c  | 2 --
 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 2 --
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 --
 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 --
 drivers/gpu/drm/omapdrm/dss/omapdss.h   | 2 --
 15 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c 
b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index a49bc4a8dcae..6b640ede6614 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -132,7 +132,6 @@ static void tvc_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in;
 
ddata->vm = *vm;
-   dssdev->panel.vm = *vm;
 
in->ops.atv->set_timings(in, vm);
 }
@@ -186,7 +185,6 @@ static int tvc_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
-   dssdev->panel.vm = tvc_pal_vm;
 
r = omapdss_register_display(dssdev);
if (r) {
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index c320f3c5ae6c..84598ea12a9b 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -139,7 +139,6 @@ static void dvic_set_timings(struct omap_dss_device *dssdev,
struct omap_dss_device *in = ddata->in;
 
ddata->vm = *vm;
-   dssdev->panel.vm = *vm;
 
in->ops.dvi->set_timings(in, vm);
 }
@@ -403,7 +402,6 @@ static int dvic_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_DVI;
dssdev->owner = THIS_MODULE;
-   dssdev->panel.vm = dvic_default_vm;
 
r = omapdss_register_display(dssdev);
if (r) {
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c 
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 6f12f9bb8054..e031280468fb 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -142,7 +142,6 @@ static void hdmic_set_timings(struct omap_dss_device 
*dssdev,
struct omap_dss_device *in = ddata->in;
 
ddata->vm = *vm;
-   dssdev->panel.vm = *vm;
 
in->ops.hdmi->set_timings(in, vm);
 }
@@ -368,7 +367,6 @@ static int hdmic_probe(struct platform_device *pdev)
dssdev->dev = >dev;
dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
dssdev->owner = THIS_MODULE;
-   dssdev->panel.vm = hdmic_default_vm;
 
r = omapdss_register_display(dssdev);
if (r) {
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index 27d63a14efe3..0e3f4a20e531 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -143,7 +143,6 @@ static void opa362_set_timings(struct omap_dss_device 
*dssdev,
dev_dbg(dssdev->dev, "set_timings\n");
 
ddata->vm = *vm;
-   dssdev->panel.vm = *vm;
 
in->ops.atv->set_timings(in, vm);
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 566c63a3ad59..08e63e39d0b7 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -137,7 +137,6 @@ static void tfp410_set_timings(struct omap_dss_device 
*dssdev,
tfp410_fix_timings(vm);
 
ddata->vm = *vm;
-   dssdev->panel.vm = *vm;
 
in->ops.dpi->set_timings(in, vm);
 }
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c 
b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 4753e5455f82..f35e2afa3e9c 100644
--- 

[PATCH v2 04/60] drm/omap: dss: Remove display ordering from dss/display.c

[Laurent Pinchart]

From: Peter Ujfalusi 

As ordering of the dss_devices based on DT aliases is now implemented in
omap_drm.c, there is no need to do the ordering in dss/display.c
anymore.

At the same time remove the alias member of the omap_dss_device struct
since it is no longer needed. The only place it was used is in the
omapdss_register_display() function.

Signed-off-by: Peter Ujfalusi 
Signed-off-by: Tomi Valkeinen 
Reviewed-by: Laurent Pinchart 
Signed-off-by: Laurent Pinchart 
---
Changes since v0:

- Use %u to format display ID
---
 drivers/gpu/drm/omapdrm/dss/display.c | 15 +++
 drivers/gpu/drm/omapdrm/dss/omapdss.h |  2 --
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/display.c 
b/drivers/gpu/drm/omapdrm/dss/display.c
index 3ef99f344bd3..25c3be86d7f4 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -41,7 +41,6 @@ static int disp_num_counter;
 int omapdss_register_display(struct omap_dss_device *dssdev)
 {
struct omap_dss_driver *drv = dssdev->driver;
-   struct list_head *cur;
int id;
 
/*
@@ -54,26 +53,18 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
 
dssdev->alias_id = id;
 
-   snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", id);
-
/* Use 'label' property for name, if it exists */
of_property_read_string(dssdev->dev->of_node, "label", >name);
 
if (dssdev->name == NULL)
-   dssdev->name = dssdev->alias;
+   dssdev->name = devm_kasprintf(dssdev->dev, GFP_KERNEL,
+ "display%u", id);
 
if (drv && drv->get_timings == NULL)
drv->get_timings = omapdss_default_get_timings;
 
mutex_lock(_list_mutex);
-   list_for_each(cur, _list) {
-   struct omap_dss_device *ldev = list_entry(cur,
-struct omap_dss_device,
-panel_list);
-   if (strcmp(ldev->alias, dssdev->alias) > 0)
-   break;
-   }
-   list_add_tail(>panel_list, cur);
+   list_add_tail(>panel_list, _list);
mutex_unlock(_list_mutex);
return 0;
 }
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h 
b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index eae105b0b961..8d530057a4b9 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -465,8 +465,6 @@ struct omap_dss_device {
 
struct list_head panel_list;
 
-   /* alias in the form of "display%d" */
-   char alias[16];
unsigned int alias_id;
 
enum omap_display_type type;
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 05/60] drm/omap: dss: Gather OMAP DSS components at probe time

[Laurent Pinchart]

The omapdss_gather_components() function walks the OF graph to create a
list of all components part of the display device. There's no need to
delay this operation until DSS bind time as we have all the information
we need at probe time.

Signed-off-by: Laurent Pinchart 
---
 drivers/gpu/drm/omapdrm/dss/dss.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c 
b/drivers/gpu/drm/omapdrm/dss/dss.c
index 0b908e9de792..d27d7f85bcd1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1323,7 +1323,6 @@ static int dss_bind(struct device *dev)
 
pm_set_vt_switch(0);
 
-   omapdss_gather_components(dev);
omapdss_set_dss(dss);
 
return 0;
@@ -1474,6 +1473,8 @@ static int dss_probe(struct platform_device *pdev)
   dss);
 
/* Add all the child devices as components. */
+   omapdss_gather_components(>dev);
+
device_for_each_child(>dev, , dss_add_child_component);
 
r = component_master_add_with_match(>dev, _component_ops, 
match);
-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 4/6] drm/omap: gem: Replace struct_mutex usage with omap_obj private lock

[Laurent Pinchart]

Hello,

On Friday, 25 May 2018 19:39:23 EEST Laurent Pinchart wrote:
> The DRM device struct_mutex is used to protect against concurrent GEM
> object operations that deal with memory allocation and pinning. All
> those operations are local to a GEM object and don't need to be
> serialized across different GEM objects. Replace the struct_mutex with
> a local omap_obj.lock or drop it altogether where not needed.
> 
> Signed-off-by: Laurent Pinchart 
> Reviewed-by: Tomi Valkeinen 
> ---
> Changes since v1:
> 
> - Use lockdep_assert_held() to verify locking correctness
> ---
>  drivers/gpu/drm/omapdrm/omap_debugfs.c |   7 --
>  drivers/gpu/drm/omapdrm/omap_fbdev.c   |   8 +--
>  drivers/gpu/drm/omapdrm/omap_gem.c | 122 --
>  3 files changed, 81 insertions(+), 56 deletions(-)

[snip]

> diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c
> b/drivers/gpu/drm/omapdrm/omap_gem.c index 0a9ba1f711e6..39cbc7273b29
> 100644
> --- a/drivers/gpu/drm/omapdrm/omap_gem.c
> +++ b/drivers/gpu/drm/omapdrm/omap_gem.c

[snip]

> -/** release backing pages */
> +/* Release backing pages. Must be called with the omap_obj.lock held. */
>  static void omap_gem_detach_pages(struct drm_gem_object *obj)
>  {
>   struct omap_gem_object *omap_obj = to_omap_bo(obj);
>   unsigned int npages = obj->size >> PAGE_SHIFT;
>   unsigned int i;
> 
> + lockdep_assert_held(_obj->lock);
> +
>   for (i = 0; i < npages; i++) {
>   if (omap_obj->dma_addrs[i])
>   dma_unmap_page(obj->dev->dev, omap_obj->dma_addrs[i],

[snip]

> @@ -1056,15 +1091,16 @@ void omap_gem_free_object(struct drm_gem_object
> *obj)
> 
>   omap_gem_evict(obj);
> 
> - WARN_ON(!mutex_is_locked(>struct_mutex));
> -
>   spin_lock(>list_lock);
>   list_del(_obj->mm_list);
>   spin_unlock(>list_lock);
> 
> - /* this means the object is still pinned.. which really should
> -  * not happen.  I think..
> + /*
> +  * No need to take the omap_obj.lock as at this point we own the sole
> +  * reference to the object.
>*/

And this of course causes a lockdep warning, as the function calls 
omap_gem_detach_pages(), and the lockdep_assert_held() call there doesn't know 
we're the sole owner. I've sent a v2.1 to fix this.

> +
> + /* The object should not be pinned. */
>   WARN_ON(omap_obj->dma_addr_cnt > 0);
> 
>   if (omap_obj->pages) {

[snip]

-- 
Regards,

Laurent Pinchart



___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2.1 4/6] drm/omap: gem: Replace struct_mutex usage with omap_obj private lock

[Laurent Pinchart]

The DRM device struct_mutex is used to protect against concurrent GEM
object operations that deal with memory allocation and pinning. All
those operations are local to a GEM object and don't need to be
serialized across different GEM objects. Replace the struct_mutex with
a local omap_obj.lock or drop it altogether where not needed.

Signed-off-by: Laurent Pinchart 
Reviewed-by: Tomi Valkeinen 
---
Changes since v2:

- Take the omap_obj lock when destroying the GEM object to avoid a
  lockdep warning

Changes since v1:

- Use lockdep_assert_held() to verify locking correctness
---
 drivers/gpu/drm/omapdrm/omap_debugfs.c |   7 --
 drivers/gpu/drm/omapdrm/omap_fbdev.c   |   8 +--
 drivers/gpu/drm/omapdrm/omap_gem.c | 127 ++---
 3 files changed, 86 insertions(+), 56 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c 
b/drivers/gpu/drm/omapdrm/omap_debugfs.c
index b42e286616b0..95ade441caa8 100644
--- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
+++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -30,17 +30,10 @@ static int gem_show(struct seq_file *m, void *arg)
struct drm_info_node *node = (struct drm_info_node *) m->private;
struct drm_device *dev = node->minor->dev;
struct omap_drm_private *priv = dev->dev_private;
-   int ret;
-
-   ret = mutex_lock_interruptible(>struct_mutex);
-   if (ret)
-   return ret;
 
seq_printf(m, "All Objects:\n");
omap_gem_describe_objects(>obj_list, m);
 
-   mutex_unlock(>struct_mutex);
-
return 0;
 }
 
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c 
b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 0f66c74a54b0..d958cc813a94 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -170,13 +170,11 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
goto fail;
}
 
-   mutex_lock(>struct_mutex);
-
fbi = drm_fb_helper_alloc_fbi(helper);
if (IS_ERR(fbi)) {
dev_err(dev->dev, "failed to allocate fb info\n");
ret = PTR_ERR(fbi);
-   goto fail_unlock;
+   goto fail;
}
 
DBG("fbi=%p, dev=%p", fbi, dev);
@@ -212,12 +210,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
 
-   mutex_unlock(>struct_mutex);
-
return 0;
 
-fail_unlock:
-   mutex_unlock(>struct_mutex);
 fail:
 
if (ret) {
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c 
b/drivers/gpu/drm/omapdrm/omap_gem.c
index 0a9ba1f711e6..749e5abdd27c 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -47,6 +47,9 @@ struct omap_gem_object {
/** roll applied when mapping to DMM */
u32 roll;
 
+   /** protects dma_addr_cnt, block, pages, dma_addrs and vaddr */
+   struct mutex lock;
+
/**
 * dma_addr contains the buffer DMA address. It is valid for
 *
@@ -220,7 +223,10 @@ static void omap_gem_evict(struct drm_gem_object *obj)
  * Page Management
  */
 
-/* Ensure backing pages are allocated. */
+/*
+ * Ensure backing pages are allocated. Must be called with the omap_obj.lock
+ * held.
+ */
 static int omap_gem_attach_pages(struct drm_gem_object *obj)
 {
struct drm_device *dev = obj->dev;
@@ -230,6 +236,8 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
int i, ret;
dma_addr_t *addrs;
 
+   lockdep_assert_held(_obj->lock);
+
/*
 * If not using shmem (in which case backing pages don't need to be
 * allocated) or if pages are already allocated we're done.
@@ -291,13 +299,15 @@ static int omap_gem_attach_pages(struct drm_gem_object 
*obj)
return ret;
 }
 
-/** release backing pages */
+/* Release backing pages. Must be called with the omap_obj.lock held. */
 static void omap_gem_detach_pages(struct drm_gem_object *obj)
 {
struct omap_gem_object *omap_obj = to_omap_bo(obj);
unsigned int npages = obj->size >> PAGE_SHIFT;
unsigned int i;
 
+   lockdep_assert_held(_obj->lock);
+
for (i = 0; i < npages; i++) {
if (omap_obj->dma_addrs[i])
dma_unmap_page(obj->dev->dev, omap_obj->dma_addrs[i],
@@ -485,13 +495,12 @@ int omap_gem_fault(struct vm_fault *vmf)
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *obj = vma->vm_private_data;
struct omap_gem_object *omap_obj = to_omap_bo(obj);
-   struct drm_device *dev = obj->dev;
int ret;
 
/* Make sure we don't parallel update on a fault, nor move or remove
 * something from beneath our feet
 */
-   mutex_lock(>struct_mutex);
+   mutex_lock(_obj->lock);
 
/* if a shmem backed 

Re: [RFC PATCH v2 1/2] drm: Add generic colorkey properties

[Laurent Pinchart]

On Saturday, 26 May 2018 19:16:54 EEST Laurent Pinchart wrote:
> Hi Dimitri,

And sorry for the spelling mistake :-/

> Thank you for the patch.
> 
> I'll review this in details, but as this patch is based on the "[PATCH/RFC
> 1/4] drm: Add colorkey properties" patch I've submitted, please retain the
> authorship, both in the Signed-off-by line, and in the patch author in git.
> 
> On Saturday, 26 May 2018 18:56:22 EEST Dmitry Osipenko wrote:
> > Color keying is the action of replacing pixels matching a given color
> > (or range of colors) with transparent pixels in an overlay when
> > performing blitting. Depending on the hardware capabilities, the
> > matching pixel can either become fully transparent or gain adjustment
> > of the pixels component values.
> > 
> > Color keying is found in a large number of devices whose capabilities
> > often differ, but they still have enough common features in range to
> > standardize color key properties. This commit adds nine generic DRM plane
> > properties related to the color keying to cover various HW capabilities.
> > 
> > This patch is based on the initial work done by Laurent Pinchart, most of
> > credits for this patch goes to him.
> > 
> > Signed-off-by: Dmitry Osipenko 
> > ---
> > 
> >  drivers/gpu/drm/drm_atomic.c |  36 ++
> >  drivers/gpu/drm/drm_blend.c  | 229 +++
> >  include/drm/drm_blend.h  |   3 +
> >  include/drm/drm_plane.h  |  77 
> >  4 files changed, 345 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> > index 895741e9cd7d..5b808cb68654 100644
> > --- a/drivers/gpu/drm/drm_atomic.c
> > +++ b/drivers/gpu/drm/drm_atomic.c
> > @@ -799,6 +799,24 @@ static int drm_atomic_plane_set_property(struct
> > drm_plane *plane, state->rotation = val;
> > 
> > } else if (property == plane->zpos_property) {
> > 
> > state->zpos = val;
> > 
> > +   } else if (property == plane->colorkey.mode_property) {
> > +   state->colorkey.mode = val;
> > +   } else if (property == plane->colorkey.min_property) {
> > +   state->colorkey.min = val;
> > +   } else if (property == plane->colorkey.max_property) {
> > +   state->colorkey.max = val;
> > +   } else if (property == plane->colorkey.format_property) {
> > +   state->colorkey.format = val;
> > +   } else if (property == plane->colorkey.mask_property) {
> > +   state->colorkey.mask = val;
> > +   } else if (property == plane->colorkey.inverted_match_property) {
> > +   state->colorkey.inverted_match = val;
> > +   } else if (property == plane->colorkey.replacement_mask_property) {
> > +   state->colorkey.replacement_mask = val;
> > +   } else if (property == plane->colorkey.replacement_value_property) {
> > +   state->colorkey.replacement_value = val;
> > +   } else if (property == plane->colorkey.replacement_format_property) {
> > +   state->colorkey.replacement_format = val;
> > 
> > } else if (property == plane->color_encoding_property) {
> > 
> > state->color_encoding = val;
> > 
> > } else if (property == plane->color_range_property) {
> > 
> > @@ -864,6 +882,24 @@ drm_atomic_plane_get_property(struct drm_plane
> > *plane,
> > 
> > *val = state->rotation;
> > 
> > } else if (property == plane->zpos_property) {
> > 
> > *val = state->zpos;
> > 
> > +   } else if (property == plane->colorkey.mode_property) {
> > +   *val = state->colorkey.mode;
> > +   } else if (property == plane->colorkey.min_property) {
> > +   *val = state->colorkey.min;
> > +   } else if (property == plane->colorkey.max_property) {
> > +   *val = state->colorkey.max;
> > +   } else if (property == plane->colorkey.format_property) {
> > +   *val = state->colorkey.format;
> > +   } else if (property == plane->colorkey.mask_property) {
> > +   *val = state->colorkey.mask;
> > +   } else if (property == plane->colorkey.inverted_match_property) {
> > +   *val = state->colorkey.inverted_match;
> > +   } else if (property == plane->colorkey.replacement_mask_property) {
> > +   *val = state->colorkey.replacement_mask;
> > +   } else if (property == plane->colorkey.replacement_value_property) {
> > +   *val = state->colorkey.replacement_value;
> > +   } else if (property == plane->colorkey.replacement_format_property) {
> > +   *val = state->colorkey.replacement_format;
> > 
> > } else if (property == plane->color_encoding_property) {
> > 
> > *val = state->color_encoding;
> > 
> > } else if (property == plane->color_range_property) {
> > 
> > diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
> > index a16a74d7e15e..05e5632ce375 100644
> > --- a/drivers/gpu/drm/drm_blend.c
> > +++ b/drivers/gpu/drm/drm_blend.c
> > @@ -107,6 +107,11 @@
> > 
> >   * planes. 

Re: [RFC PATCH v2 1/2] drm: Add generic colorkey properties

[Laurent Pinchart]

Hi Dimitri,

Thank you for the patch.

I'll review this in details, but as this patch is based on the "[PATCH/RFC 
1/4] drm: Add colorkey properties" patch I've submitted, please retain the 
authorship, both in the Signed-off-by line, and in the patch author in git.

On Saturday, 26 May 2018 18:56:22 EEST Dmitry Osipenko wrote:
> Color keying is the action of replacing pixels matching a given color
> (or range of colors) with transparent pixels in an overlay when
> performing blitting. Depending on the hardware capabilities, the
> matching pixel can either become fully transparent or gain adjustment
> of the pixels component values.
> 
> Color keying is found in a large number of devices whose capabilities
> often differ, but they still have enough common features in range to
> standardize color key properties. This commit adds nine generic DRM plane
> properties related to the color keying to cover various HW capabilities.
> 
> This patch is based on the initial work done by Laurent Pinchart, most of
> credits for this patch goes to him.
> 
> Signed-off-by: Dmitry Osipenko 
> ---
>  drivers/gpu/drm/drm_atomic.c |  36 ++
>  drivers/gpu/drm/drm_blend.c  | 229 +++
>  include/drm/drm_blend.h  |   3 +
>  include/drm/drm_plane.h  |  77 
>  4 files changed, 345 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 895741e9cd7d..5b808cb68654 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -799,6 +799,24 @@ static int drm_atomic_plane_set_property(struct
> drm_plane *plane, state->rotation = val;
>   } else if (property == plane->zpos_property) {
>   state->zpos = val;
> + } else if (property == plane->colorkey.mode_property) {
> + state->colorkey.mode = val;
> + } else if (property == plane->colorkey.min_property) {
> + state->colorkey.min = val;
> + } else if (property == plane->colorkey.max_property) {
> + state->colorkey.max = val;
> + } else if (property == plane->colorkey.format_property) {
> + state->colorkey.format = val;
> + } else if (property == plane->colorkey.mask_property) {
> + state->colorkey.mask = val;
> + } else if (property == plane->colorkey.inverted_match_property) {
> + state->colorkey.inverted_match = val;
> + } else if (property == plane->colorkey.replacement_mask_property) {
> + state->colorkey.replacement_mask = val;
> + } else if (property == plane->colorkey.replacement_value_property) {
> + state->colorkey.replacement_value = val;
> + } else if (property == plane->colorkey.replacement_format_property) {
> + state->colorkey.replacement_format = val;
>   } else if (property == plane->color_encoding_property) {
>   state->color_encoding = val;
>   } else if (property == plane->color_range_property) {
> @@ -864,6 +882,24 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
>   *val = state->rotation;
>   } else if (property == plane->zpos_property) {
>   *val = state->zpos;
> + } else if (property == plane->colorkey.mode_property) {
> + *val = state->colorkey.mode;
> + } else if (property == plane->colorkey.min_property) {
> + *val = state->colorkey.min;
> + } else if (property == plane->colorkey.max_property) {
> + *val = state->colorkey.max;
> + } else if (property == plane->colorkey.format_property) {
> + *val = state->colorkey.format;
> + } else if (property == plane->colorkey.mask_property) {
> + *val = state->colorkey.mask;
> + } else if (property == plane->colorkey.inverted_match_property) {
> + *val = state->colorkey.inverted_match;
> + } else if (property == plane->colorkey.replacement_mask_property) {
> + *val = state->colorkey.replacement_mask;
> + } else if (property == plane->colorkey.replacement_value_property) {
> + *val = state->colorkey.replacement_value;
> + } else if (property == plane->colorkey.replacement_format_property) {
> + *val = state->colorkey.replacement_format;
>   } else if (property == plane->color_encoding_property) {
>   *val = state->color_encoding;
>   } else if (property == plane->color_range_property) {
> diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
> index a16a74d7e15e..05e5632ce375 100644
> --- a/drivers/gpu/drm/drm_blend.c
> +++ b/drivers/gpu/drm/drm_blend.c
> @@ -107,6 +107,11 @@
>   *   planes. Without this property the primary plane is always below the
> cursor *  plane, and ordering between all other planes is undefined.
>   *
> + * colorkey:
> + *   Color keying is set up with drm_plane_create_colorkey_properties().
> + *   It adds support for replacing a range of colors with a transparent

[Bug 106594] [radeonsi,regression,apitrace] Prison Architect rendered unplayable by multicoloured flickering triangles and overlayed triangles when performing certain actions

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=106594

--- Comment #4 from Kai  ---
Still an issue with the following stack (fully updated Debian testing as a
base):
GPU: Hawaii PRO [Radeon R9 290] (ChipID = 0x67b1)
Mesa: Git:master/79fe00efb4
libdrm: 2.4.92-1
LLVM: SVN:trunk/r39 (7.0 devel)
X.Org: 2:1.19.6-1
Linux: 4.16.11
Firmware (firmware-amd-graphics): 20170823-1
libclc: Git:master/a2118d58fc
DDX (xserver-xorg-video-amdgpu): 18.0.1-1

Forcing the OpenGL level back to 3.0 (the same OpenGL level the Intel GPU from
comment #3 supported) doesn't help either.

However, I did find, that when I downgrade to Debian's Mesa package 18.0.4-1
(built against LLVM 6.0 (package version 1:6.0-3+b1)), I cannot reproduce this
bug any longer. Therefore the bug must have been introduced in either Mesa
between 18.0.4 and the current Git HEAD or LLVM between the 6.0 release and the
current SVN HEAD.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 106175] amdgpu.dc=1 shows performance issues with Xorg compositors when moving windows

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=106175

--- Comment #13 from tempel.jul...@gmail.com ---
When I use modesetting driver with Option "PageFlip" "false", the stuttering is
gone (however, as expected tearing is not fully prevented anymore).
So there might be an actual connection to pageflipping?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 106666] amdgpu 0000:09:00.0: [gfxhub] VMC page fault (src_id:0 ring:56 vmid:3 pas_id:0), [drm:amdgpu_job_timedout [amdgpu]] *ERROR* ring gfx timeout, last signaled seq=327845, last emitted seq=32

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=10

--- Comment #1 from udo  ---
Created attachment 139790
  --> https://bugs.freedesktop.org/attachment.cgi?id=139790=edit
messages

no xorg log messages for this one

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 106666] amdgpu 0000:09:00.0: [gfxhub] VMC page fault (src_id:0 ring:56 vmid:3 pas_id:0), [drm:amdgpu_job_timedout [amdgpu]] *ERROR* ring gfx timeout, last signaled seq=327845, last emitted seq=32

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=10

Bug ID: 10
   Summary: amdgpu :09:00.0: [gfxhub] VMC page fault (src_id:0
ring:56 vmid:3 pas_id:0), [drm:amdgpu_job_timedout
[amdgpu]] *ERROR* ring gfx timeout, last signaled
seq=327845, last emitted seq=327847
   Product: DRI
   Version: unspecified
  Hardware: Other
OS: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: DRM/AMDgpu
  Assignee: dri-devel@lists.freedesktop.org
  Reporter: udo...@xs4all.nl

Created attachment 139789
  --> https://bugs.freedesktop.org/attachment.cgi?id=139789=edit
dmesg

While watching a youtube video the screen froze but the youtube audio continued
for a while. The box was reachable via ssh. No restart of xorg did fix the
situation.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Boot failures in -next on Jetson TK1

[Mark Brown]

Currently -next is failing to boot on Jetson TK1.  The problem looks to
be the Nouveau driver, during initialization it reports an address
decode error then starts printing error messages saying "nouveau
5700.gpu: fifo: SCHED_ERROR 20 []" over and over again.

I've pasted the start of the errors below, you can see a full log and
more details at:

   https://kernelci.org/boot/id/5b0882a259b514339779a881/

The warnings about Spectre are a separate issue and don't seem to affect
the boot.

[ 15.194484] nouveau 5700.gpu: NVIDIA GK20A (0ea000a1)
[   15.200109] udevd[109]: could not rename interface '3' from 'eth0' to 
'enp1s0': Device or resource busy
[   15.206399] nouveau 5700.gpu: imem: using IOMMU
[   15.315122] CPU2: Spectre v2: firmware did not set auxiliary control 
register IBE bit, system vulnerable
[   15.320021] nouveau 5700.gpu: Direct firmware load for 
nvidia/gk20a/fecs_inst.bin failed with error -2
[   15.384841] nouveau 5700.gpu: Direct firmware load for 
nouveau/nvea_fuc409c failed with error -2
[   15.393972] nouveau 5700.gpu: Direct firmware load for nouveau/fuc409c 
failed with error -2
[   15.402679] nouveau 5700.gpu: gr: failed to load fuc409c
[   15.409434] CPU1: Spectre v2: firmware did not set auxiliary control 
register IBE bit, system vulnerable
[   15.419398] CPU1: Spectre v2: firmware did not set auxiliary control 
register IBE bit, system vulnerable
[   15.482568] tegra-mc 70019000.memory-controller: gpusrd: read @0x00041200: 
EMEM address decode error (EMEM decode error)
[   15.491232] [TTM] Zone  kernel: Available graphics memory: 375202 kiB
[   15.502768] [TTM] Zone highmem: Available graphics memory: 1030050 kiB
[   15.509290] [TTM] Initializing pool allocator
[   15.513658] nouveau 5700.gpu: DRM: VRAM: 0 MiB
[   15.518451] nouveau 5700.gpu: DRM: GART: 1048576 MiB
[   15.526546] CPU1: Spectre v2: firmware did not set auxiliary control 
register IBE bit, system vulnerable
[   15.527290] tegra-mc 70019000.memory-controller: gpusrd: read @0x00072000: 
EMEM address decode error (EMEM decode error)
[   15.537050] CPU1: Spectre v2: firmware did not set auxiliary control 
register IBE bit, system vulnerable
[   15.546928] nouveau 5700.gpu: fifo: SCHED_ERROR 20 []


signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel