Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f218909 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.10-fixes' of... 

Merge tag 'omapdrm-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next

omapdrm fixes for v4.10

* fix tpd12s015's error handling, which causes omap5 uevm HDMI to fail
* fix omapdrm primary plane allocation bug, which makes the display to fail to
  come up

* tag 'omapdrm-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: tpd12s015: fix error handling
  drm/omap: fix primary-plane's possible_crtcs
  drm: fix possible_crtc's type
parents e783fd0c 5c2a392d

drivers/gpu/drm/drm_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static unsigned int drm_num_planes(struct drm_device *dev) 
 * Zero on success, error code on failure.

 */

int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,

			     unsigned long possible_crtcs,

			     uint32_t possible_crtcs,

			     const struct drm_plane_funcs *funcs,

			     const uint32_t *formats, unsigned int format_count,

			     enum drm_plane_type type,
@@ -196,7 +196,7 @@ void drm_plane_unregister_all(struct drm_device *dev) 
 * Zero on success, error code on failure.

 */

int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,

		   unsigned long possible_crtcs,

		   uint32_t possible_crtcs,

		   const struct drm_plane_funcs *funcs,

		   const uint32_t *formats, unsigned int format_count,

		   bool is_primary)

drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c

+9 −4
Original line number Diff line number Diff line
@@ -234,25 +234,30 @@ static int tpd_probe(struct platform_device *pdev) 
	if (r)

		return r;





	gpio = devm_gpiod_get_index_optional(&pdev->dev, NULL, 0,

		 GPIOD_OUT_LOW);

	if (IS_ERR(gpio))

	if (IS_ERR(gpio)) {

		r = PTR_ERR(gpio);

		goto err_gpio;

	}



	ddata->ct_cp_hpd_gpio = gpio;



	gpio = devm_gpiod_get_index_optional(&pdev->dev, NULL, 1,

		 GPIOD_OUT_LOW);

	if (IS_ERR(gpio))

	if (IS_ERR(gpio)) {

		r = PTR_ERR(gpio);

		goto err_gpio;

	}



	ddata->ls_oe_gpio = gpio;



	gpio = devm_gpiod_get_index(&pdev->dev, NULL, 2,

		GPIOD_IN);

	if (IS_ERR(gpio))

	if (IS_ERR(gpio)) {

		r = PTR_ERR(gpio);

		goto err_gpio;

	}



	ddata->hpd_gpio = gpio;

drivers/gpu/drm/omapdrm/omap_drv.c

+12 −5
Original line number Diff line number Diff line
@@ -267,13 +267,15 @@ static int omap_connect_dssdevs(void) 
}



static int omap_modeset_create_crtc(struct drm_device *dev, int id,

				    enum omap_channel channel)

				    enum omap_channel channel,

				    u32 possible_crtcs)

{

	struct omap_drm_private *priv = dev->dev_private;

	struct drm_plane *plane;

	struct drm_crtc *crtc;



	plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_PRIMARY);

	plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_PRIMARY,

		possible_crtcs);

	if (IS_ERR(plane))

		return PTR_ERR(plane);
@@ -309,6 +311,7 @@ static int omap_modeset_init(struct drm_device *dev) 
	int num_crtcs;

	int i, id = 0;

	int ret;

	u32 possible_crtcs;



	drm_mode_config_init(dev);
@@ -325,6 +328,7 @@ static int omap_modeset_init(struct drm_device *dev) 
	 * We use the num_crtc argument to limit the number of crtcs we create.

	 */

	num_crtcs = min3(num_crtc, num_mgrs, num_ovls);

	possible_crtcs = (1 << num_crtcs) - 1;



	dssdev = NULL;
@@ -388,7 +392,8 @@ static int omap_modeset_init(struct drm_device *dev) 
		 * allocated crtc, we create a new crtc for it

		 */

		if (!channel_used(dev, channel)) {

			ret = omap_modeset_create_crtc(dev, id, channel);

			ret = omap_modeset_create_crtc(dev, id, channel,

				possible_crtcs);

			if (ret < 0) {

				dev_err(dev->dev,

					"could not create CRTC (channel %u)\n",
@@ -418,7 +423,8 @@ static int omap_modeset_init(struct drm_device *dev) 
			return -ENOMEM;

		}



		ret = omap_modeset_create_crtc(dev, id, i);

		ret = omap_modeset_create_crtc(dev, id, i,

			possible_crtcs);

		if (ret < 0) {

			dev_err(dev->dev,

				"could not create CRTC (channel %u)\n", i);
@@ -432,7 +438,8 @@ static int omap_modeset_init(struct drm_device *dev) 
	for (; id < num_ovls; id++) {

		struct drm_plane *plane;



		plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_OVERLAY);

		plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_OVERLAY,

			possible_crtcs);

		if (IS_ERR(plane))

			return PTR_ERR(plane);

drivers/gpu/drm/omapdrm/omap_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 
int omap_crtc_wait_pending(struct drm_crtc *crtc);



struct drm_plane *omap_plane_init(struct drm_device *dev,

		int id, enum drm_plane_type type);

		int id, enum drm_plane_type type,

		u32 possible_crtcs);

void omap_plane_install_properties(struct drm_plane *plane,

		struct drm_mode_object *obj);

drivers/gpu/drm/omapdrm/omap_plane.c

+3 −3
Original line number Diff line number Diff line
@@ -356,9 +356,9 @@ static const uint32_t error_irqs[] = { 


/* initialize plane */

struct drm_plane *omap_plane_init(struct drm_device *dev,

		int id, enum drm_plane_type type)

		int id, enum drm_plane_type type,

		u32 possible_crtcs)

{

	struct omap_drm_private *priv = dev->dev_private;

	struct drm_plane *plane;

	struct omap_plane *omap_plane;

	int ret;
@@ -381,7 +381,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, 
	omap_plane->error_irq.irq = omap_plane_error_irq;

	omap_irq_register(dev, &omap_plane->error_irq);



	ret = drm_universal_plane_init(dev, plane, (1 << priv->num_crtcs) - 1,

	ret = drm_universal_plane_init(dev, plane, possible_crtcs,

				       &omap_plane_funcs, omap_plane->formats,

				       omap_plane->nformats, type, NULL);

	if (ret < 0)