search for: backlight_device

...| 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drm/nouveau/nouveau_backlight.c b/drm/nouveau/nouveau_backlight.c index 380f3402..55172655 100644 --- a/drm/nouveau/nouveau_backlight.c +++ b/drm/nouveau/nouveau_backlight.c @@ -134,7 +134,7 @@ nv50_get_intensity(struct backlight_device *bd) struct nouveau_encoder *nv_encoder = bl_get_data(bd); struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); struct nvif_object *device = &drm->client.device.object; - int or = nv_encoder->or; + int or = ffs(nv_encoder->dcb->or) - 1; u32 div = 1025; u32...

...> + * + * Register locations derived from NVClock by Roderick Colenbrander + */ + +#include <linux/backlight.h> + +#include "drmP.h" +#include "nouveau_drv.h" +#include "nouveau_drm.h" +#include "nouveau_reg.h" + +static int nv40_get_intensity(struct backlight_device *bd) +{ + struct drm_device *dev = bl_get_data(bd); + struct drm_nouveau_private *dev_priv = dev->dev_private; + int val = (NV_READ(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16; + + return val; +} + +static int nv40_set_intensity(struct backlight_device *bd) +{ + struct drm_dev...

...rm/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...

...ple_get(&bl_ida, 0, 0, GFP_KERNEL); + if (nb > 0 && nb < 100) + snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb); + else + snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight"); + connector->id = nb; +} + static int nv40_get_intensity(struct backlight_device *bd) { @@ -74,6 +95,8 @@ nv40_backlight_init(struct drm_connector *connector) struct nvif_object *device = &drm->device.object; struct backlight_properties props; struct backlight_device *bd; + struct backlight_connector bl_connector; + char backlight_name[BL_NAME_SIZE]; if (!(nvi...

Forward declare struct backlight_device and remove the include statement. Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de> Reviewed-by: Jani Nikula <jani.nikula at intel.com> --- include/linux/fb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index 2ce2...

...r) +{ + const int nb = ida_simple_get(&bl_ida, 0, 0, GFP_KERNEL); + if (nb > 0 && nb < 100) + sprintf(backlight_name, "nv_backlight%d", nb); + else + sprintf(backlight_name, "nv_backlight"); + connector->id = nb; +} + static int nv40_get_intensity(struct backlight_device *bd) { @@ -74,6 +94,8 @@ nv40_backlight_init(struct drm_connector *connector) struct nvif_object *device = &drm->device.object; struct backlight_properties props; struct backlight_device *bd; + struct backlight_connector bl_connector; + char backlight_name[15]; // 12 for name + 2 for...

...if (nb < 0 || nb >= 100) + return false; + if (nb > 0) + snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb); + else + snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight"); + connector->id = nb; + return true; +} + static int nv40_get_intensity(struct backlight_device *bd) { @@ -74,6 +98,8 @@ nv40_backlight_init(struct drm_connector *connector) struct nvif_object *device = &drm->device.object; struct backlight_properties props; struct backlight_device *bd; + struct backlight_connector bl_connector; + char backlight_name[BL_NAME_SIZE]; if (!(nvi...

...is should be unnecessary. I'd also call it "backlights" or something like that. No need for multiple words... > + > +static char* nouveau_get_backlight_name(void); Please organize the code to avoid forward declarations. > + > 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; > &gt...

...ZE, "nv_backlight"); > + connector->id = nb; > +} > + Just a minor issue, in the >= 100 case, backlight creation should probably fail rather than reverting to "nv_backlight". Other than that LGTM. Thanks, Lukas > static int > nv40_get_intensity(struct backlight_device *bd) > { > @@ -74,6 +95,8 @@ nv40_backlight_init(struct drm_connector *connector) > struct nvif_object *device = &drm->device.object; > struct backlight_properties props; > struct backlight_device *bd; > + struct backlight_connector bl_connector; > + char backligh...

Next version of https://patchwork.freedesktop.org/series/48596/ . Made some important changes to the refactoring patch, but everything else is the same. Lyude Paul (5): drm/nouveau: Check backlight IDs are >= 0, not > 0 drm/nouveau: Move backlight device into nouveau_connector drm/nouveau: s/nouveau_backlight_exit/nouveau_backlight_fini/ drm/nouveau: Cleanup indenting in

Next version of https://patchwork.freedesktop.org/series/48596/ . Added NV_INFO_ONCE and made "Move backlight device into nouveau_connector" use that instead so we don't print the GMUX warning more then once. Lyude Paul (5): drm/nouveau: Add NV_PRINTK_ONCE and variants drm/nouveau: Move backlight device into nouveau_connector drm/nouveau:

Forgot to send 6 patches instead of five since there's one new one now, whoops! No actual changes, next version of https://patchwork.freedesktop.org/series/48596/ Lyude Paul (6): drm/nouveau: Check backlight IDs are >= 0, not > 0 drm/nouveau: Add NV_PRINTK_ONCE and variants drm/nouveau: Move backlight device into nouveau_connector drm/nouveau:

Refactor for Ben, hopefully this time this should apply to his tree. Next version of https://patchwork.freedesktop.org/series/48596/ No changes otherwise. Lyude Paul (6): drm/nouveau: Check backlight IDs are >= 0, not > 0 drm/nouveau: Add NV_PRINTK_ONCE and variants drm/nouveau: Move backlight device into nouveau_connector drm/nouveau:

This series fixes some issues with nouveau's backlight support that were causing kernel panics on module reloads, specifically on systems with nouveau handling the backlight of one of the displays. While we're at it, let's cleanup nouveau_backlight.c as well Lyude Paul (5): drm/nouveau: Check backlight IDs are >= 0, not > 0 drm/nouveau: Move backlight device into

...ner of those nouns, rathter than a counter of those nouns. But I’ll change it. > > > + > > +static char* nouveau_get_backlight_name(void); > > Please organize the code to avoid forward declarations. > > > + > > 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* b...

...[<ffffffff819a55b4>] down_write+0x44/0x80 >> [ 18.983795] [<ffffffff810abf91>] blocking_notifier_chain_register+0x21/0xb0 >> [ 18.983798] [<ffffffff814c7448>] fb_register_client+0x18/0x20 >> [ 18.983800] [<ffffffff814c6c86>] backlight_device_register+0x136/0x260 >> [ 18.983852] [<ffffffffa0127eb2>] intel_backlight_device_register+0xa2/0x160 [i915] >> [ 18.983892] [<ffffffffa00f46be>] intel_connector_register+0xe/0x10 [i915] >> [ 18.983932] [<ffffffffa0112bfb>] intel_dp_conn...

...18.983792] [<ffffffff819a55b4>] down_write+0x44/0x80 > [ 18.983795] [<ffffffff810abf91>] blocking_notifier_chain_register+0x21/0xb0 > [ 18.983798] [<ffffffff814c7448>] fb_register_client+0x18/0x20 > [ 18.983800] [<ffffffff814c6c86>] backlight_device_register+0x136/0x260 > [ 18.983852] [<ffffffffa0127eb2>] intel_backlight_device_register+0xa2/0x160 [i915] > [ 18.983892] [<ffffffffa00f46be>] intel_connector_register+0xe/0x10 [i915] > [ 18.983932] [<ffffffffa0112bfb>] intel_dp_connector_regist...

...0xb1/0x200 [ 18.983792] [<ffffffff819a55b4>] down_write+0x44/0x80 [ 18.983795] [<ffffffff810abf91>] blocking_notifier_chain_register+0x21/0xb0 [ 18.983798] [<ffffffff814c7448>] fb_register_client+0x18/0x20 [ 18.983800] [<ffffffff814c6c86>] backlight_device_register+0x136/0x260 [ 18.983852] [<ffffffffa0127eb2>] intel_backlight_device_register+0xa2/0x160 [i915] [ 18.983892] [<ffffffffa00f46be>] intel_connector_register+0xe/0x10 [i915] [ 18.983932] [<ffffffffa0112bfb>] intel_dp_connector_register+0x1b/0x80 [i...

...ffff819a55b4>] down_write+0x44/0x80 > >> [ 18.983795] [<ffffffff810abf91>] blocking_notifier_chain_register+0x21/0xb0 > >> [ 18.983798] [<ffffffff814c7448>] fb_register_client+0x18/0x20 > >> [ 18.983800] [<ffffffff814c6c86>] backlight_device_register+0x136/0x260 > >> [ 18.983852] [<ffffffffa0127eb2>] intel_backlight_device_register+0xa2/0x160 [i915] > >> [ 18.983892] [<ffffffffa00f46be>] intel_connector_register+0xe/0x10 [i915] > >> [ 18.983932] [<ffffffffa0112bfb>...

Remove unnecessary dependencies in the include statements of the header file <linux/fb.h>. Several files throughout the kernel include the fbdev header, so reducing dependencies positively affects other subsystems as well. Also fix up nouveau and fbtft, which need backlight.h in some their source files. v2: * include backlight.h in fbtft (kernel test robot) Thomas Zimmermann (8):