Merge branch 'linux-4.21' of git://github.com/skeggsb/linux into drm-fixes (ae5e5ae9) · Commits · 戴 / test

drivers/gpu/drm/nouveau/nouveau_backlight.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,9 @@ nouveau_backlight_init(struct drm_connector *connector)
		case NV_DEVICE_INFO_V0_FERMI:
		case NV_DEVICE_INFO_V0_KEPLER:
		case NV_DEVICE_INFO_V0_MAXWELL:
		case NV_DEVICE_INFO_V0_PASCAL:
		case NV_DEVICE_INFO_V0_VOLTA:
		case NV_DEVICE_INFO_V0_TURING:
		ret = nv50_backlight_init(nv_encoder, &props, &ops);
		break;
		default:

+5 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <engine/falcon.h>

		#include <core/gpuobj.h>
		#include <subdev/mc.h>
		#include <subdev/timer.h>
		#include <engine/fifo.h>

		@@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend)
		}
		}

		if (nvkm_mc_enabled(device, engine->subdev.index)) {
		nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
		nvkm_wr32(device, base + 0x014, 0xffffffff);
		}
		return 0;
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -132,11 +132,12 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
		duty = nvkm_therm_update_linear(therm);
		break;
		case NVBIOS_THERM_FAN_OTHER:
		if (therm->cstate)
		if (therm->cstate) {
		duty = therm->cstate;
		else
		duty = nvkm_therm_update_linear_fallback(therm);
		poll = false;
		} else {
		duty = nvkm_therm_update_linear_fallback(therm);
		}
		break;
		}
		immd = false;