Commit 9c346968 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.7' of git://github.com/skeggsb/linux into drm-next 



A couple of misc fixes/workarounds for some issues that are causing a
lot of pain for people.

Of most interest are the PCI power management and GR init WARs, which
effect a rather significant number of laptop systems that are in use
today.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv5Ef5YKS9EPBH3YUubzvVr++_rzjgSqV_B5nC0L2kB6-Q@mail.gmail.com
parents 3208a24f 374b5580

drivers/gpu/drm/nouveau/dispnv04/dac.c

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 


#include <subdev/bios/gpio.h>

#include <subdev/gpio.h>

#include <subdev/timer.h>



#include <nvif/timer.h>



int nv04_dac_output_offset(struct drm_encoder *encoder)

{

drivers/gpu/drm/nouveau/dispnv04/hw.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hw.h"



#include <subdev/bios/pll.h>

#include <nvif/timer.h>



#define CHIPSET_NFORCE 0x01a0

#define CHIPSET_NFORCE2 0x01f0

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <nvif/cl507c.h>

#include <nvif/event.h>

#include <nvif/timer.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

drivers/gpu/drm/nouveau/dispnv50/core507d.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "head.h"



#include <nvif/cl507d.h>

#include <nvif/timer.h>



#include "nouveau_bo.h"

drivers/gpu/drm/nouveau/dispnv50/corec37d.c

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#include <nouveau_bo.h>



#include <nvif/timer.h>



void

corec37d_wndw_owner(struct nv50_core *core)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE