Attachment 122083 Details for Bug 86539 – Allow multiple backlight interfaces for Nouveau

[patch] Allow multiple backlight interfaces for Nouveau

file_86539.txt (text/plain), 2.77 KB, created by Pierre Moreau on 2016-03-02 13:06:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Moreau

Created: 2016-03-02 13:06:12 UTC

Size: 2.77 KB

patch

obsolete

>diff --git a/drm/nouveau/nouveau_backlight.c b/drm/nouveau/nouveau_backlight.c
>index 89eb460..d88f017 100644
>--- a/drm/nouveau/nouveau_backlight.c
>+++ b/drm/nouveau/nouveau_backlight.c
>@@ -36,6 +36,10 @@
> #include "nouveau_reg.h"
> #include "nouveau_encoder.h"
> 
>+static atomic_t bl_interfaces_nb = { 0 };
>+
>+static char* nouveau_get_backlight_name(void);
>+
> static int
> nv40_get_intensity(struct backlight_device *bd)
> {
>@@ -74,6 +78,7 @@ nv40_backlight_init(struct drm_connector *connector)
> 	struct nvif_object *device = &drm->device.object;
> 	struct backlight_properties props;
> 	struct backlight_device *bd;
>+	char* backlight_name = NULL;
> 
> 	if (!(nvif_rd32(device, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
> 		return 0;
>@@ -81,10 +86,13 @@ nv40_backlight_init(struct drm_connector *connector)
> 	memset(&props, 0, sizeof(struct backlight_properties));
> 	props.type = BACKLIGHT_RAW;
> 	props.max_brightness = 31;
>-	bd = backlight_device_register("nv_backlight", connector->kdev, drm,
>+	backlight_name = nouveau_get_backlight_name();
>+	bd = backlight_device_register(backlight_name , connector->kdev, drm,
> 				       &nv40_bl_ops, &props);
>-	if (IS_ERR(bd))
>+	if (IS_ERR(bd)) {
>+		kfree(backlight_name);
> 		return PTR_ERR(bd);
>+	}
> 	drm->backlight = bd;
> 	bd->props.brightness = nv40_get_intensity(bd);
> 	backlight_update_status(bd);
>@@ -182,6 +190,7 @@ nv50_backlight_init(struct drm_connector *connector)
> 	struct backlight_properties props;
> 	struct backlight_device *bd;
> 	const struct backlight_ops *ops;
>+	char* backlight_name = NULL;
> 
> 	nv_encoder = find_encoder(connector, DCB_OUTPUT_LVDS);
> 	if (!nv_encoder) {
>@@ -203,11 +212,13 @@ nv50_backlight_init(struct drm_connector *connector)
> 	memset(&props, 0, sizeof(struct backlight_properties));
> 	props.type = BACKLIGHT_RAW;
> 	props.max_brightness = 100;
>-	bd = backlight_device_register("nv_backlight", connector->kdev,
>+	backlight_name = nouveau_get_backlight_name();
>+	bd = backlight_device_register(backlight_name, connector->kdev,
> 				       nv_encoder, ops, &props);
>-	if (IS_ERR(bd))
>+	if (IS_ERR(bd)) {
>+		kfree(backlight_name);
> 		return PTR_ERR(bd);
>-
>+	}
> 	drm->backlight = bd;
> 	bd->props.brightness = bd->ops->get_brightness(bd);
> 	backlight_update_status(bd);
>@@ -252,3 +263,16 @@ nouveau_backlight_exit(struct drm_device *dev)
> 		drm->backlight = NULL;
> 	}
> }
>+
>+static char*
>+nouveau_get_backlight_name(void)
>+{
>+	// 12 chars for "nv_backlight" + 2 for two digits number + 1 for '\0'
>+	char* backlight_name = (char*)kmalloc(sizeof(char[15]), GFP_KERNEL);
>+	const int nb = atomic_inc_return(&bl_interfaces_nb) - 1;
>+	if (nb > 0 && nb < 100)
>+		sprintf(backlight_name, "nv_backlight%d", nb);
>+	else
>+		sprintf(backlight_name, "nv_backlight");
>+	return backlight_name;
>+}

Actions: View | Splinter Review

Attachments on bug 86539: 109822 | 121231 | 121232 | 122019 | 122083

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.