Commit 0180290a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/nouveau-misc-2022-07-13-1' of git://anongit.freedesktop.org/drm/drm into drm-next 



drm/nouveau next misc

This is a set of misc nouveau patches skeggsb left queued up, just
flushing some of them out.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Dave Airlie <airlied@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAPM=9txSS9Pdagpi=3JJeFOGy6ALWC31WZdQxLBkfGeL3O+T1A@mail.gmail.com
parents 1ebdc90e 89ed996b

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

+0 −16
Original line number Diff line number Diff line
@@ -2623,14 +2623,6 @@ nv50_display_fini(struct drm_device *dev, bool runtime, bool suspend) 
{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct drm_encoder *encoder;

	struct drm_plane *plane;



	drm_for_each_plane(plane, dev) {

		struct nv50_wndw *wndw = nv50_wndw(plane);

		if (plane->funcs != &nv50_wndw)

			continue;

		nv50_wndw_fini(wndw);

	}



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST)
@@ -2646,7 +2638,6 @@ nv50_display_init(struct drm_device *dev, bool resume, bool runtime) 
{

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

	struct drm_encoder *encoder;

	struct drm_plane *plane;



	if (resume || runtime)

		core->func->init(core);
@@ -2659,13 +2650,6 @@ nv50_display_init(struct drm_device *dev, bool resume, bool runtime) 
		}

	}



	drm_for_each_plane(plane, dev) {

		struct nv50_wndw *wndw = nv50_wndw(plane);

		if (plane->funcs != &nv50_wndw)

			continue;

		nv50_wndw_init(wndw);

	}



	return 0;

}

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

+0 −12
Original line number Diff line number Diff line
@@ -694,18 +694,6 @@ nv50_wndw_notify(struct nvif_notify *notify) 
	return NVIF_NOTIFY_KEEP;

}



void

nv50_wndw_fini(struct nv50_wndw *wndw)

{

	nvif_notify_put(&wndw->notify);

}



void

nv50_wndw_init(struct nv50_wndw *wndw)

{

	nvif_notify_get(&wndw->notify);

}



static const u64 nv50_cursor_format_modifiers[] = {

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID,

drivers/gpu/drm/nouveau/dispnv50/wndw.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ int nv50_wndw_new_(const struct nv50_wndw_func *, struct drm_device *, 
		   enum drm_plane_type, const char *name, int index,

		   const u32 *format, enum nv50_disp_interlock_type,

		   u32 interlock_data, u32 heads, struct nv50_wndw **);

void nv50_wndw_init(struct nv50_wndw *);

void nv50_wndw_fini(struct nv50_wndw *);

void nv50_wndw_flush_set(struct nv50_wndw *, u32 *interlock,

			 struct nv50_wndw_atom *);

void nv50_wndw_flush_clr(struct nv50_wndw *, u32 *interlock, bool flush,

drivers/gpu/drm/nouveau/include/nvif/object.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ struct nvif_object { 
	} map;

};



static inline bool

nvif_object_constructed(struct nvif_object *object)

{

	return object->client != NULL;

}



int  nvif_object_ctor(struct nvif_object *, const char *name, u32 handle,

		      s32 oclass, void *, u32, struct nvif_object *);

void nvif_object_dtor(struct nvif_object *);

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __NVKM_DEVICE_H__

#define __NVKM_DEVICE_H__

#include <core/oclass.h>

#include <core/event.h>

enum nvkm_subdev_type;



enum nvkm_device_type {
@@ -28,8 +27,6 @@ struct nvkm_device { 


	void __iomem *pri;



	struct nvkm_event event;



	u32 debug;



	const struct nvkm_device_chip *chip;