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

Commit 318f6e59 authored by Daniel Vetter's avatar Daniel Vetter Committed by Greg Kroah-Hartman
Browse files

drm/lease: Send a distinct uevent 



commit ce85882860f0e756f7066cbda1c43e8b50b73ab6 upstream.

Sending the exact same hotplug event is not great uapi. Luckily the
only already merged implementation of leases (in the -modesetting
driver) doesn't care about what kind of uevent it gets, and
unconditionally processes both hotplug and lease changes. So we can
still adjust the uapi here.

But e.g. weston tries to filter stuff, and I guess others might want
to do that too. Try to make that possible. Cc: stable since it's uapi
adjustement that we want to roll out everywhere.

Michel Dänzer mentioned on irc that -amdgpu also has lease support. It
has the same code flow as -modesetting though, so we can still go
ahead.

v2: Mention -amdgpu (Michel)

Cc: Keith Packard <keithp@keithp.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181129094226.30591-1-daniel.vetter@ffwll.ch


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcf5d0db

drivers/gpu/drm/drm_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,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