Commit 15f9d8b8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-08-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



 * backmerge from drm-fixes at v5.8-rc7
 * add orientation quirk for ASUS T103HAF
 * drm/omap: force runtime PM suspend on system suspend
 * drm/tidss: fix modeset init for DPI panels
 * re-added docs for drm_gem_flink_ioctl()
 * ttm: fix page-offset calculation within TTM

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804125510.GA29670@linux-uq9g
parents c44264f9 b5ac98cb

drivers/gpu/drm/drm_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -879,6 +879,9 @@ err: 
 * @file_priv: drm file-private structure

 *

 * Open an object using the global name, returning a handle and the size.

 *

 * This handle (of course) holds a reference to the object, so the object

 * will not go away until the handle is deleted.

 */

int

drm_gem_open_ioctl(struct drm_device *dev, void *data,

drivers/gpu/drm/drm_panel_orientation_quirks.c

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ static const struct dmi_system_id orientation_data[] = { 
		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"),

		},

		.driver_data = (void *)&lcd800x1280_rightside_up,

	}, {	/* Asus T103HAF */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"),

		},

		.driver_data = (void *)&lcd800x1280_rightside_up,

	}, {	/* GPD MicroPC (generic strings, also match on bios date) */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),

drivers/gpu/drm/omapdrm/dss/dispc.c

+1 −0
Original line number Diff line number Diff line
@@ -4915,6 +4915,7 @@ static int dispc_runtime_resume(struct device *dev) 
static const struct dev_pm_ops dispc_pm_ops = {

	.runtime_suspend = dispc_runtime_suspend,

	.runtime_resume = dispc_runtime_resume,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)

};



struct platform_driver omap_dispchw_driver = {

drivers/gpu/drm/omapdrm/dss/dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -5467,6 +5467,7 @@ static int dsi_runtime_resume(struct device *dev) 
static const struct dev_pm_ops dsi_pm_ops = {

	.runtime_suspend = dsi_runtime_suspend,

	.runtime_resume = dsi_runtime_resume,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)

};



struct platform_driver omap_dsihw_driver = {

drivers/gpu/drm/omapdrm/dss/dss.c

+1 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ static int dss_runtime_resume(struct device *dev) 
static const struct dev_pm_ops dss_pm_ops = {

	.runtime_suspend = dss_runtime_suspend,

	.runtime_resume = dss_runtime_resume,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)

};



struct platform_driver omap_dsshw_driver = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE