Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ee79562 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



nouveau fixes and TU116 enablement.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5hZ3B4S9cVTPd2-Ug7dMSasLPJrWMyoDo4MOg8cbXWkA@mail.gmail.com
parents 9fb7dc73 4d352dbd

drivers/gpu/drm/nouveau/Kbuild

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: MIT

ccflags-y += -I $(srctree)/$(src)/include

ccflags-y += -I $(srctree)/$(src)/include/nvkm

ccflags-y += -I $(srctree)/$(src)/nvkm

drivers/gpu/drm/nouveau/dispnv04/Kbuild

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: MIT

nouveau-y += dispnv04/arb.o

nouveau-y += dispnv04/crtc.o

nouveau-y += dispnv04/cursor.o

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

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: MIT

#include <drm/drmP.h>

#include <drm/drm_mode.h>

#include "nouveau_drv.h"

drivers/gpu/drm/nouveau/dispnv04/disp.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: MIT */

#ifndef __NV04_DISPLAY_H__

#define __NV04_DISPLAY_H__

#include <subdev/bios.h>

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: MIT

nouveau-y += dispnv50/disp.o

nouveau-y += dispnv50/lut.o