mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
drm/nv50/backlight: express brightness level in percent
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
10b461e40a
commit
09461459e1
1 changed files with 7 additions and 3 deletions
|
@ -100,8 +100,11 @@ nv50_get_intensity(struct backlight_device *bd)
|
||||||
struct nouveau_encoder *nv_encoder = bl_get_data(bd);
|
struct nouveau_encoder *nv_encoder = bl_get_data(bd);
|
||||||
struct drm_device *dev = nv_encoder->base.base.dev;
|
struct drm_device *dev = nv_encoder->base.base.dev;
|
||||||
int or = nv_encoder->or;
|
int or = nv_encoder->or;
|
||||||
|
u32 div = 1025;
|
||||||
|
u32 val;
|
||||||
|
|
||||||
return nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT + (or * 0x800));
|
val = nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT + (or * 0x800));
|
||||||
|
return ((val * 100) + (div / 2)) / div;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -109,8 +112,9 @@ nv50_set_intensity(struct backlight_device *bd)
|
||||||
{
|
{
|
||||||
struct nouveau_encoder *nv_encoder = bl_get_data(bd);
|
struct nouveau_encoder *nv_encoder = bl_get_data(bd);
|
||||||
struct drm_device *dev = nv_encoder->base.base.dev;
|
struct drm_device *dev = nv_encoder->base.base.dev;
|
||||||
int val = bd->props.brightness;
|
|
||||||
int or = nv_encoder->or;
|
int or = nv_encoder->or;
|
||||||
|
u32 div = 1025;
|
||||||
|
u32 val = (bd->props.brightness * div) / 100;
|
||||||
|
|
||||||
nv_wr32(dev, NV50_PDISPLAY_SOR_BACKLIGHT + (or * 0x800),
|
nv_wr32(dev, NV50_PDISPLAY_SOR_BACKLIGHT + (or * 0x800),
|
||||||
val | NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE);
|
val | NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE);
|
||||||
|
@ -147,7 +151,7 @@ nv50_backlight_init(struct drm_connector *connector)
|
||||||
|
|
||||||
memset(&props, 0, sizeof(struct backlight_properties));
|
memset(&props, 0, sizeof(struct backlight_properties));
|
||||||
props.type = BACKLIGHT_RAW;
|
props.type = BACKLIGHT_RAW;
|
||||||
props.max_brightness = 1025;
|
props.max_brightness = 100;
|
||||||
bd = backlight_device_register("nv_backlight", &connector->kdev,
|
bd = backlight_device_register("nv_backlight", &connector->kdev,
|
||||||
nv_encoder, &nv50_bl_ops, &props);
|
nv_encoder, &nv50_bl_ops, &props);
|
||||||
if (IS_ERR(bd))
|
if (IS_ERR(bd))
|
||||||
|
|
Loading…
Reference in a new issue