Commit a1cd3486 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/tegra/for-5.8-rc3' of git://anongit.freedesktop.org/tegra/linux into drm-fixes 



drm/tegra: Fixes for v5.8-rc3

This contains a fairly random assortment of fixes for various minor
issues.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thierry Reding <thierry.reding@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200624165254.2763104-1-thierry.reding@gmail.com
parents 5107683f fce3a51d

drivers/gpu/drm/tegra/dc.c

+1 −0
Original line number Diff line number Diff line
@@ -957,6 +957,7 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm, 
	}



	drm_plane_helper_add(&plane->base, &tegra_cursor_plane_helper_funcs);

	drm_plane_create_zpos_immutable_property(&plane->base, 255);



	return &plane->base;

}

drivers/gpu/drm/tegra/hub.c

+15 −2
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ int tegra_display_hub_prepare(struct tegra_display_hub *hub) 
	for (i = 0; i < hub->soc->num_wgrps; i++) {

		struct tegra_windowgroup *wgrp = &hub->wgrps[i];



		/* Skip orphaned window group whose parent DC is disabled */

		if (wgrp->parent)

			tegra_windowgroup_enable(wgrp);

	}
@@ -166,6 +168,8 @@ void tegra_display_hub_cleanup(struct tegra_display_hub *hub) 
	for (i = 0; i < hub->soc->num_wgrps; i++) {

		struct tegra_windowgroup *wgrp = &hub->wgrps[i];



		/* Skip orphaned window group whose parent DC is disabled */

		if (wgrp->parent)

			tegra_windowgroup_disable(wgrp);

	}

}
@@ -944,6 +948,15 @@ static int tegra_display_hub_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to register host1x client: %d\n",

			err);



	err = devm_of_platform_populate(&pdev->dev);

	if (err < 0)

		goto unregister;



	return err;



unregister:

	host1x_client_unregister(&hub->client);

	pm_runtime_disable(&pdev->dev);

	return err;

}

drivers/gpu/host1x/bus.c

+9 −0
Original line number Diff line number Diff line
@@ -686,8 +686,17 @@ EXPORT_SYMBOL(host1x_driver_register_full); 
 */

void host1x_driver_unregister(struct host1x_driver *driver)

{

	struct host1x *host1x;



	driver_unregister(&driver->driver);



	mutex_lock(&devices_lock);



	list_for_each_entry(host1x, &devices, list)

		host1x_detach_driver(host1x, driver);



	mutex_unlock(&devices_lock);



	mutex_lock(&drivers_lock);

	list_del_init(&driver->list);

	mutex_unlock(&drivers_lock);

drivers/gpu/host1x/dev.c

+9 −2
Original line number Diff line number Diff line
@@ -468,11 +468,18 @@ static int host1x_probe(struct platform_device *pdev) 


	err = host1x_register(host);

	if (err < 0)

		goto deinit_intr;

		goto deinit_debugfs;



	err = devm_of_platform_populate(&pdev->dev);

	if (err < 0)

		goto unregister;



	return 0;



deinit_intr:

unregister:

	host1x_unregister(host);

deinit_debugfs:

	host1x_debug_deinit(host);

	host1x_intr_deinit(host);

deinit_syncpt:

	host1x_syncpt_deinit(host);

include/linux/host1x.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ struct host1x_client_ops { 
 * @channel: host1x channel associated with this client

 * @syncpts: array of syncpoints requested for this client

 * @num_syncpts: number of syncpoints requested for this client

 * @parent: pointer to parent structure

 * @usecount: reference count for this structure

 * @lock: mutex for mutually exclusive concurrency

 */

struct host1x_client {

	struct list_head list;

CRA Git | Maintained and supported by SUSTech CRA and CCSE