Commit c689b069 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Just a couple of fixes to GP10x ACR support after the work, and a
(fairly severe if you're running piglit a lot) memory leak fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv51mZaRuT5R=VhbKSTPzd15L4FbDiPQ+wsF+C23c_fOAQ@mail.gmail.com
parents a04616a3 ee864216

drivers/gpu/drm/nouveau/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config DRM_NOUVEAU

	tristate "Nouveau (NVIDIA) cards"

	depends on DRM && PCI && MMU

	select IOMMU_API

	select FW_LOADER

	select DRM_KMS_HELPER

	select DRM_TTM

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

+1 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct nv_sim_state { 
static void

nv04_calc_arb(struct nv_fifo_info *fifo, struct nv_sim_state *arb)

{

	int pagemiss, cas, width, bpp;

	int pagemiss, cas, bpp;

	int nvclks, mclks, crtpagemiss;

	int found, mclk_extra, mclk_loop, cbs, m1, p1;

	int mclk_freq, pclk_freq, nvclk_freq;
@@ -65,7 +65,6 @@ nv04_calc_arb(struct nv_fifo_info *fifo, struct nv_sim_state *arb) 
	nvclk_freq = arb->nvclk_khz;

	pagemiss = arb->mem_page_miss;

	cas = arb->mem_latency;

	width = arb->memory_width >> 6;

	bpp = arb->bpp;

	cbs = 128;

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

+0 −2
Original line number Diff line number Diff line
@@ -1669,7 +1669,6 @@ nv50_pior_enable(struct drm_encoder *encoder) 
{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nouveau_connector *nv_connector;

	struct nv50_head_atom *asyh = nv50_head_atom(nv_crtc->base.state);

	struct nv50_core *core = nv50_disp(encoder->dev)->core;

	u8 owner = 1 << nv_crtc->index;
@@ -1677,7 +1676,6 @@ nv50_pior_enable(struct drm_encoder *encoder) 


	nv50_outp_acquire(nv_encoder);



	nv_connector = nouveau_encoder_connector_get(nv_encoder);

	switch (asyh->or.bpc) {

	case 10: asyh->or.depth = 0x6; break;

	case  8: asyh->or.depth = 0x5; break;

drivers/gpu/drm/nouveau/nvkm/core/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ nvkm_memory_tags_get(struct nvkm_memory *memory, struct nvkm_device *device, 
	}



	refcount_set(&tags->refcount, 1);

	*ptags = memory->tags = tags;

	mutex_unlock(&fb->subdev.mutex);

	*ptags = tags;

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ void gp100_gr_init_fecs_exceptions(struct gf100_gr *); 
void gp100_gr_init_shader_exceptions(struct gf100_gr *, int, int);

void gp100_gr_zbc_clear_color(struct gf100_gr *, int);

void gp100_gr_zbc_clear_depth(struct gf100_gr *, int);

extern const struct gf100_gr_func_zbc gp100_gr_zbc;



void gp102_gr_init_swdx_pes_mask(struct gf100_gr *);

extern const struct gf100_gr_func_zbc gp102_gr_zbc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE