Commit 2bc7ea71 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm/nouveau-misc: display patches.

These are just some precursor and cleanup display patches from Ben,
tested by Lyude.

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

From: Dave Airlie <airlied@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAPM=9ty0R37q0mohBr_CegpYLXK2=fAH54QfAsMhHfPygTsdQA@mail.gmail.com
parents ee8b1ef9 dfc4005f

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

+23 −20
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;
@@ -529,24 +529,15 @@ static enum drm_connector_status 
nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

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

	struct {

		struct nv50_disp_mthd_v1 base;

		struct nv50_disp_dac_load_v0 load;

	} args = {

		.base.version = 1,

		.base.method = NV50_DISP_MTHD_V1_DAC_LOAD,

		.base.hasht  = nv_encoder->dcb->hasht,

		.base.hashm  = nv_encoder->dcb->hashm,

	};

	u32 loadval;

	int ret;



	args.load.data = nouveau_drm(encoder->dev)->vbios.dactestval;

	if (args.load.data == 0)

		args.load.data = 340;

	loadval = nouveau_drm(encoder->dev)->vbios.dactestval;

	if (loadval == 0)

		loadval = 340;



	ret = nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));

	if (ret || !args.load.load)

	ret = nvif_outp_load_detect(&nv_encoder->outp, loadval);

	if (ret <= 0)

		return connector_status_disconnected;



	return connector_status_connected;
@@ -563,6 +554,10 @@ nv50_dac_help = { 
static void

nv50_dac_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	drm_encoder_cleanup(encoder);

	kfree(encoder);

}
@@ -576,6 +571,7 @@ static int 
nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)

{

	struct nouveau_drm *drm = nouveau_drm(connector->dev);

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

	struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);

	struct nvkm_i2c_bus *bus;

	struct nouveau_encoder *nv_encoder;
@@ -599,7 +595,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	drm_encoder_helper_add(encoder, &nv50_dac_help);



	drm_connector_attach_encoder(connector, encoder);

	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/*
@@ -1822,6 +1818,9 @@ static void 
nv50_sor_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	nv50_mstm_del(&nv_encoder->dp.mstm);

	drm_encoder_cleanup(encoder);
@@ -1918,7 +1917,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe) 
			nv_encoder->i2c = &bus->i2c;

	}



	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/******************************************************************************
@@ -1999,6 +1998,10 @@ nv50_pior_help = { 
static void

nv50_pior_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	drm_encoder_cleanup(encoder);

	kfree(encoder);

}
@@ -2056,7 +2059,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	disp->core->func->pior->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);

	nv50_outp_dump_caps(drm, nv_encoder);



	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/******************************************************************************

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;