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

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

Merge tag 'drm-misc-fixes-2018-12-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



UAPI:
- Distinguish lease events from hotplug (Daniel)

Other:
- omap: Restore panel-dpi bus flags (Tomi)
- omap: Fix a couple of dsi issues (Sebastian)

Cc: Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181205201428.GA35447@art_vandelay
parents c6c2097a b31a3ca7

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define SN_AUX_ADDR_7_0_REG			0x76

#define SN_AUX_LENGTH_REG			0x77

#define SN_AUX_CMD_REG				0x78

#define  AUX_CMD_SEND				BIT(1)

#define  AUX_CMD_SEND				BIT(0)

#define  AUX_CMD_REQ(x)				((x) << 4)

#define SN_AUX_RDATA_REG(x)			(0x79 + (x))

#define SN_SSC_CONFIG_REG			0x93

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ MODULE_PARM_DESC(drm_fbdev_overalloc, 
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)

static bool drm_leak_fbdev_smem = false;

module_param_unsafe(drm_leak_fbdev_smem, bool, 0600);

MODULE_PARM_DESC(fbdev_emulation,

MODULE_PARM_DESC(drm_leak_fbdev_smem,

		 "Allow unsafe leaking fbdev physical smem address [default=false]");

#endif

drivers/gpu/drm/drm_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor); 
int drm_sysfs_connector_add(struct drm_connector *connector);

void drm_sysfs_connector_remove(struct drm_connector *connector);



void drm_sysfs_lease_event(struct drm_device *dev);



/* drm_gem.c */

int drm_gem_init(struct drm_device *dev);

void drm_gem_destroy(struct drm_device *dev);

drivers/gpu/drm/drm_lease.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ void drm_lease_destroy(struct drm_master *master) 


	if (master->lessor) {

		/* Tell the master to check the lessee list */

		drm_sysfs_hotplug_event(dev);

		drm_sysfs_lease_event(dev);

		drm_master_put(&master->lessor);

	}

drivers/gpu/drm/drm_sysfs.c

+10 −0
Original line number Diff line number Diff line
@@ -301,6 +301,16 @@ void drm_sysfs_connector_remove(struct drm_connector *connector) 
	connector->kdev = NULL;

}



void drm_sysfs_lease_event(struct drm_device *dev)

{

	char *event_string = "LEASE=1";

	char *envp[] = { event_string, NULL };



	DRM_DEBUG("generating lease event\n");



	kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp);

}



/**

 * drm_sysfs_hotplug_event - generate a DRM uevent

 * @dev: DRM device