Commit 89ed996b authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/kms/nv50-: remove unused functions 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ea0b20d3

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

+0 −16
Original line number Original line 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 nouveau_drm *drm = nouveau_drm(dev);

	struct drm_encoder *encoder;

	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) {

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

		if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST)

		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 nv50_core *core = nv50_disp(dev)->core;

	struct drm_encoder *encoder;

	struct drm_encoder *encoder;

	struct drm_plane *plane;





	if (resume || runtime)

	if (resume || runtime)

		core->func->init(core);

		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;

	return 0;

}

}

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

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

	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[] = {

static const u64 nv50_cursor_format_modifiers[] = {

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID,

	DRM_FORMAT_MOD_INVALID,

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

+0 −2
Original line number Original line 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,

		   enum drm_plane_type, const char *name, int index,

		   const u32 *format, enum nv50_disp_interlock_type,

		   const u32 *format, enum nv50_disp_interlock_type,

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

		   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,

void nv50_wndw_flush_set(struct nv50_wndw *, u32 *interlock,

			 struct nv50_wndw_atom *);

			 struct nv50_wndw_atom *);

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

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