-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next
Karol's work which greatly improves volt/clock changes on a heap of boards, nothing too exciting beyond a random collection of fixes. * 'linux-4.9' of git://github.com/skeggsb/linux: (33 commits) drm/nouveau/fb/nv50: defer DMA mapping of scratch page to oneinit() hook drm/nouveau/fb/gf100: defer DMA mapping of scratch page to oneinit() hook drm/nouveau/pci: set streaming DMA mask early drm/nouveau/kms: add Maxwell to backlight initialization drm/nouveau/bar/nv50: fix bar2 vm size drm/nouveau/disp: remove unused function in sorg94.c drm/nouveau/volt: use kernel's 64-bit signed division function drm/nouveau/core: add missing header dependencies drm/nouveau/gr/nv3x: add 0x0597 kelvin 3d class support drm/nouveau/drm/nouveau: add a LED driver for the NVIDIA logo drm/nouveau/fb/ram: Use Kepler implementation on Maxwell drm/nouveau/volt: Make use of cvb coefficients drm/nouveau/volt/gf100-: Add speedo drm/nouveau/volt: Add implementation for gf100 drm/nouveau/bios/vmap: unk0 field is the mode drm/nouveau/volt: Don't require perfect fit drm/nouveau/clk: Allow boosting only when NvBoost is set drm/nouveau/bios: Add parsing of VPSTATE table drm/nouveau/clk: Respect voltage limits in nvkm_cstate_prog drm/nouveau/clk: Fixup cstate selection ...
- Loading branch information
Showing
44 changed files
with
904 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 8 additions & 2 deletions
10
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #ifndef __NVBIOS_VPSTATE_H__ | ||
| #define __NVBIOS_VPSTATE_H__ | ||
| struct nvbios_vpstate_header { | ||
| u32 offset; | ||
|
|
||
| u8 version; | ||
| u8 hlen; | ||
| u8 ecount; | ||
| u8 elen; | ||
| u8 scount; | ||
| u8 slen; | ||
|
|
||
| u8 base_id; | ||
| u8 boost_id; | ||
| u8 tdp_id; | ||
| }; | ||
| struct nvbios_vpstate_entry { | ||
| u8 pstate; | ||
| u16 clock_mhz; | ||
| }; | ||
| int nvbios_vpstate_parse(struct nvkm_bios *, struct nvbios_vpstate_header *); | ||
| int nvbios_vpstate_entry(struct nvkm_bios *, struct nvbios_vpstate_header *, | ||
| u8 idx, struct nvbios_vpstate_entry *); | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * Copyright (C) 2016 Martin Peres | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining | ||
| * a copy of this software and associated documentation files (the | ||
| * "Software"), to deal in the Software without restriction, including | ||
| * without limitation the rights to use, copy, modify, merge, publish, | ||
| * distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to | ||
| * the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice (including the | ||
| * next paragraph) shall be included in all copies or substantial | ||
| * portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE | ||
| * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| /* | ||
| * Authors: | ||
| * Martin Peres <martin.peres@free.fr> | ||
| */ | ||
|
|
||
| #include <linux/leds.h> | ||
|
|
||
| #include "nouveau_led.h" | ||
| #include <nvkm/subdev/gpio.h> | ||
|
|
||
| static enum led_brightness | ||
| nouveau_led_get_brightness(struct led_classdev *led) | ||
| { | ||
| struct drm_device *drm_dev = container_of(led, struct nouveau_led, led)->dev; | ||
| struct nouveau_drm *drm = nouveau_drm(drm_dev); | ||
| struct nvif_object *device = &drm->device.object; | ||
| u32 div, duty; | ||
|
|
||
| div = nvif_rd32(device, 0x61c880) & 0x00ffffff; | ||
| duty = nvif_rd32(device, 0x61c884) & 0x00ffffff; | ||
|
|
||
| if (div > 0) | ||
| return duty * LED_FULL / div; | ||
| else | ||
| return 0; | ||
| } | ||
|
|
||
| static void | ||
| nouveau_led_set_brightness(struct led_classdev *led, enum led_brightness value) | ||
| { | ||
| struct drm_device *drm_dev = container_of(led, struct nouveau_led, led)->dev; | ||
| struct nouveau_drm *drm = nouveau_drm(drm_dev); | ||
| struct nvif_object *device = &drm->device.object; | ||
|
|
||
| u32 input_clk = 27e6; /* PDISPLAY.SOR[1].PWM is connected to the crystal */ | ||
| u32 freq = 100; /* this is what nvidia uses and it should be good-enough */ | ||
| u32 div, duty; | ||
|
|
||
| div = input_clk / freq; | ||
| duty = value * div / LED_FULL; | ||
|
|
||
| /* for now, this is safe to directly poke those registers because: | ||
| * - A: nvidia never puts the logo led to any other PWM controler | ||
| * than PDISPLAY.SOR[1].PWM. | ||
| * - B: nouveau does not touch these registers anywhere else | ||
| */ | ||
| nvif_wr32(device, 0x61c880, div); | ||
| nvif_wr32(device, 0x61c884, 0xc0000000 | duty); | ||
| } | ||
|
|
||
|
|
||
| int | ||
| nouveau_led_init(struct drm_device *dev) | ||
| { | ||
| struct nouveau_drm *drm = nouveau_drm(dev); | ||
| struct nvkm_gpio *gpio = nvxx_gpio(&drm->device); | ||
| struct dcb_gpio_func logo_led; | ||
| int ret; | ||
|
|
||
| if (!gpio) | ||
| return 0; | ||
|
|
||
| /* check that there is a GPIO controlling the logo LED */ | ||
| if (nvkm_gpio_find(gpio, 0, DCB_GPIO_LOGO_LED_PWM, 0xff, &logo_led)) | ||
| return 0; | ||
|
|
||
| drm->led = kzalloc(sizeof(*drm->led), GFP_KERNEL); | ||
| if (!drm->led) | ||
| return -ENOMEM; | ||
| drm->led->dev = dev; | ||
|
|
||
| drm->led->led.name = "nvidia-logo"; | ||
| drm->led->led.max_brightness = 255; | ||
| drm->led->led.brightness_get = nouveau_led_get_brightness; | ||
| drm->led->led.brightness_set = nouveau_led_set_brightness; | ||
|
|
||
| ret = led_classdev_register(dev->dev, &drm->led->led); | ||
| if (ret) { | ||
| kfree(drm->led); | ||
| return ret; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| void | ||
| nouveau_led_suspend(struct drm_device *dev) | ||
| { | ||
| struct nouveau_drm *drm = nouveau_drm(dev); | ||
|
|
||
| if (drm->led) | ||
| led_classdev_suspend(&drm->led->led); | ||
| } | ||
|
|
||
| void | ||
| nouveau_led_resume(struct drm_device *dev) | ||
| { | ||
| struct nouveau_drm *drm = nouveau_drm(dev); | ||
|
|
||
| if (drm->led) | ||
| led_classdev_resume(&drm->led->led); | ||
| } | ||
|
|
||
| void | ||
| nouveau_led_fini(struct drm_device *dev) | ||
| { | ||
| struct nouveau_drm *drm = nouveau_drm(dev); | ||
|
|
||
| if (drm->led) { | ||
| led_classdev_unregister(&drm->led->led); | ||
| kfree(drm->led); | ||
| drm->led = NULL; | ||
| } | ||
| } |
Oops, something went wrong.