Commit 889fcbe9 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/disp: add common channel class handling 



Replaces a bunch of unnecessarily duplicated boilerplate in per-chipset
code with a simpler, common, implementation.

Channel "awaken" notify code is completely gone for now.  KMS has never
made use of it so far, and event notify handling is about to be changed
in general anyway.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7bcf89ee

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

+3 −14
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
 */

#include "base.h"



#include <nvif/cl507c.h>

#include <nvif/event.h>

#include <nvif/if0014.h>

#include <nvif/push507c.h>

#include <nvif/timer.h>
@@ -306,8 +305,8 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format, 
	      struct nouveau_drm *drm, int head, s32 oclass, u32 interlock_data,

	      struct nv50_wndw **pwndw)

{

	struct nv50_disp_base_channel_dma_v0 args = {

		.head = head,

	struct nvif_disp_chan_v0 args = {

		.id = head,

	};

	struct nouveau_display *disp = nouveau_display(drm->dev);

	struct nv50_disp *disp50 = nv50_disp(drm->dev);
@@ -328,16 +327,6 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format, 
		return ret;

	}



	ret = nvif_notify_ctor(&wndw->wndw.base.user, "kmsBaseNtfy",

			       wndw->notify.func, false,

			       NV50_DISP_BASE_CHANNEL_DMA_V0_NTFY_UEVENT,

			       &(struct nvif_notify_uevent_req) {},

			       sizeof(struct nvif_notify_uevent_req),

			       sizeof(struct nvif_notify_uevent_rep),

			       &wndw->notify);

	if (ret)

		return ret;



	wndw->ntfy = NV50_DISP_BASE_NTFY(wndw->id);

	wndw->sema = NV50_DISP_BASE_SEM0(wndw->id);

	wndw->data = 0x00000000;

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "core.h"

#include "head.h"



#include <nvif/cl507d.h>

#include <nvif/if0014.h>

#include <nvif/push507c.h>

#include <nvif/timer.h>
@@ -157,7 +157,7 @@ int 
core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm,

	      s32 oclass, struct nv50_core **pcore)

{

	struct nv50_disp_core_channel_dma_v0 args = {};

	struct nvif_disp_chan_v0 args = {};

	struct nv50_disp *disp = nv50_disp(drm->dev);

	struct nv50_core *core;

	int ret;

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

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "core.h"

#include "head.h"



#include <nvif/cl507a.h>

#include <nvif/if0014.h>

#include <nvif/timer.h>



#include <nvhw/class/cl507a.h>
@@ -150,8 +150,8 @@ curs507a_new_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, 
	      int head, s32 oclass, u32 interlock_data,

	      struct nv50_wndw **pwndw)

{

	struct nv50_disp_cursor_v0 args = {

		.head = head,

	struct nvif_disp_chan_v0 args = {

		.id = head,

	};

	struct nv50_disp *disp = nv50_disp(drm->dev);

	struct nv50_wndw *wndw;

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

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
#include <nvif/class.h>

#include <nvif/cl0002.h>

#include <nvif/cl5070.h>

#include <nvif/cl507d.h>

#include <nvif/event.h>

#include <nvif/if0014.h>

#include <nvif/timer.h>



#include <nvhw/class/cl507c.h>
@@ -231,7 +231,7 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
		 struct nv50_dmac *dmac)

{

	struct nouveau_cli *cli = (void *)device->object.client;

	struct nv50_disp_core_channel_dma_v0 *args = data;

	struct nvif_disp_chan_v0 *args = data;

	u8 type = NVIF_MEM_COHERENT;

	int ret;

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

+3 −3
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
 */

#include "oimm.h"



#include <nvif/cl507b.h>

#include <nvif/if0014.h>



static int

oimm507b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm,

	       s32 oclass, struct nv50_wndw *wndw)

{

	struct nv50_disp_overlay_v0 args = {

		.head = wndw->id,

	struct nvif_disp_chan_v0 args = {

		.id = wndw->id,

	};

	struct nv50_disp *disp = nv50_disp(drm->dev);

	int ret;