Commit f6d07dfc authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "One urgent fix for an oops under console lock in some drivers, one
  uapi fix, and one revert to fix rockchip regression"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"
  drm: Don't oops in drm_calc_timestamping_constants() if drm_vblank_init() wasn't called
  drm: Use userspace compatible type in fourcc_mod_code macro
parents 0e976064 5bad7d29
...@@ -616,10 +616,18 @@ int drm_control(struct drm_device *dev, void *data, ...@@ -616,10 +616,18 @@ int drm_control(struct drm_device *dev, void *data,
void drm_calc_timestamping_constants(struct drm_crtc *crtc, void drm_calc_timestamping_constants(struct drm_crtc *crtc,
const struct drm_display_mode *mode) const struct drm_display_mode *mode)
{ {
struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)]; struct drm_device *dev = crtc->dev;
unsigned int pipe = drm_crtc_index(crtc);
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
int linedur_ns = 0, framedur_ns = 0; int linedur_ns = 0, framedur_ns = 0;
int dotclock = mode->crtc_clock; int dotclock = mode->crtc_clock;
if (!dev->num_crtcs)
return;
if (WARN_ON(pipe >= dev->num_crtcs))
return;
/* Valid dotclock? */ /* Valid dotclock? */
if (dotclock > 0) { if (dotclock > 0) {
int frame_size = mode->crtc_htotal * mode->crtc_vtotal; int frame_size = mode->crtc_htotal * mode->crtc_vtotal;
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_of.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -419,6 +418,29 @@ static int compare_of(struct device *dev, void *data) ...@@ -419,6 +418,29 @@ static int compare_of(struct device *dev, void *data)
return dev->of_node == np; return dev->of_node == np;
} }
static void rockchip_add_endpoints(struct device *dev,
struct component_match **match,
struct device_node *port)
{
struct device_node *ep, *remote;
for_each_child_of_node(port, ep) {
remote = of_graph_get_remote_port_parent(ep);
if (!remote || !of_device_is_available(remote)) {
of_node_put(remote);
continue;
} else if (!of_device_is_available(remote->parent)) {
dev_warn(dev, "parent device of %s is not available\n",
remote->full_name);
of_node_put(remote);
continue;
}
component_match_add(dev, match, compare_of, remote);
of_node_put(remote);
}
}
static int rockchip_drm_bind(struct device *dev) static int rockchip_drm_bind(struct device *dev)
{ {
struct drm_device *drm; struct drm_device *drm;
...@@ -461,14 +483,61 @@ static const struct component_master_ops rockchip_drm_ops = { ...@@ -461,14 +483,61 @@ static const struct component_master_ops rockchip_drm_ops = {
static int rockchip_drm_platform_probe(struct platform_device *pdev) static int rockchip_drm_platform_probe(struct platform_device *pdev)
{ {
int ret = drm_of_component_probe(&pdev->dev, compare_of, struct device *dev = &pdev->dev;
&rockchip_drm_ops); struct component_match *match = NULL;
struct device_node *np = dev->of_node;
struct device_node *port;
int i;
/* keep compatibility with old code that was returning -ENODEV */ if (!np)
if (ret == -EINVAL)
return -ENODEV; return -ENODEV;
/*
* Bind the crtc ports first, so that
* drm_of_find_possible_crtcs called from encoder .bind callbacks
* works as expected.
*/
for (i = 0;; i++) {
port = of_parse_phandle(np, "ports", i);
if (!port)
break;
return ret; if (!of_device_is_available(port->parent)) {
of_node_put(port);
continue;
}
component_match_add(dev, &match, compare_of, port->parent);
of_node_put(port);
}
if (i == 0) {
dev_err(dev, "missing 'ports' property\n");
return -ENODEV;
}
if (!match) {
dev_err(dev, "No available vop found for display-subsystem.\n");
return -ENODEV;
}
/*
* For each bound crtc, bind the encoders attached to its
* remote endpoint.
*/
for (i = 0;; i++) {
port = of_parse_phandle(np, "ports", i);
if (!port)
break;
if (!of_device_is_available(port->parent)) {
of_node_put(port);
continue;
}
rockchip_add_endpoints(dev, &match, port);
of_node_put(port);
}
return component_master_add_with_match(dev, &rockchip_drm_ops, match);
} }
static int rockchip_drm_platform_remove(struct platform_device *pdev) static int rockchip_drm_platform_remove(struct platform_device *pdev)
......
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
/* add more to the end as needed */ /* add more to the end as needed */
#define fourcc_mod_code(vendor, val) \ #define fourcc_mod_code(vendor, val) \
((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
/* /*
* Format Modifier tokens: * Format Modifier tokens:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment