hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/kms: move display class instantiation to library 

This function is useful outside of DRM code.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:47 +10:00
parent 512fa0b8a3
commit 0d4a2c5767
8 changed files with 129 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/nouveau/include/nvif/disp.h Normal file
View File

@ -0,0 +1,12 @@
#ifndef __NVIF_DISP_H__
#define __NVIF_DISP_H__
#include <nvif/object.h>
struct nvif_device;
struct nvif_disp {
struct nvif_object object;
};
int nvif_disp_ctor(struct nvif_device *, s32 oclass, struct nvif_disp *);
void nvif_disp_dtor(struct nvif_disp *);
#endif

16
drivers/gpu/drm/nouveau/include/nvif/object.h
View File

@ -99,6 +99,22 @@ struct nvif_mclass {
ret; \ ret; \
}) })
#define nvif_sclass(o,m,u) ({ \
const typeof(m[0]) *_mclass = (m); \
s32 _oclass = (u); \
int _cid; \
if (_oclass) { \
for (_cid = 0; _mclass[_cid].oclass; _cid++) { \
if (_mclass[_cid].oclass == _oclass) \
break; \
} \
_cid = _mclass[_cid].oclass ? _cid : -ENOSYS; \
} else { \
_cid = nvif_mclass((o), _mclass); \
} \
_cid; \
})
/*XXX*/ /*XXX*/
#include <core/object.h> #include <core/object.h>
#define nvxx_object(a) ({ \ #define nvxx_object(a) ({ \

14
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@ -151,7 +151,7 @@ nouveau_conn_atomic_set_property(struct drm_connector *connector,
/* ... except prior to G80, where the code /* ... except prior to G80, where the code
* doesn't support such things. * doesn't support such things.
*/ */
if (disp->disp.oclass < NV50_DISP) if (disp->disp.object.oclass < NV50_DISP)
return -EINVAL; return -EINVAL;
break; break;
default: default:
@ -260,7 +260,7 @@ nouveau_conn_reset(struct drm_connector *connector)
asyc->procamp.color_vibrance = 150; asyc->procamp.color_vibrance = 150;
asyc->procamp.vibrant_hue = 90; asyc->procamp.vibrant_hue = 90;
if (nouveau_display(connector->dev)->disp.oclass < NV50_DISP) { if (nouveau_display(connector->dev)->disp.object.oclass < NV50_DISP) {
switch (connector->connector_type) { switch (connector->connector_type) {
case DRM_MODE_CONNECTOR_LVDS: case DRM_MODE_CONNECTOR_LVDS:
/* See note in nouveau_conn_atomic_set_property(). */ /* See note in nouveau_conn_atomic_set_property(). */
@ -314,7 +314,7 @@ nouveau_conn_attach_properties(struct drm_connector *connector)
case DRM_MODE_CONNECTOR_TV: case DRM_MODE_CONNECTOR_TV:
break; break;
case DRM_MODE_CONNECTOR_VGA: case DRM_MODE_CONNECTOR_VGA:
if (disp->disp.oclass < NV50_DISP) if (disp->disp.object.oclass < NV50_DISP)
break; /* Can only scale on DFPs. */ break; /* Can only scale on DFPs. */
/* Fall-through. */ /* Fall-through. */
default: default:
@ -1321,7 +1321,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
} }
/* HDMI 3D support */ /* HDMI 3D support */
if ((disp->disp.oclass >= G82_DISP) if ((disp->disp.object.oclass >= G82_DISP)
&& ((type == DRM_MODE_CONNECTOR_DisplayPort) && ((type == DRM_MODE_CONNECTOR_DisplayPort)
|| (type == DRM_MODE_CONNECTOR_eDP) || (type == DRM_MODE_CONNECTOR_eDP)
|| (type == DRM_MODE_CONNECTOR_HDMIA))) || (type == DRM_MODE_CONNECTOR_HDMIA)))
@ -1343,7 +1343,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
case DCB_CONNECTOR_LVDS_SPWG: case DCB_CONNECTOR_LVDS_SPWG:
case DCB_CONNECTOR_eDP: case DCB_CONNECTOR_eDP:
/* see note in nouveau_connector_set_property() */ /* see note in nouveau_connector_set_property() */
if (disp->disp.oclass < NV50_DISP) { if (disp->disp.object.oclass < NV50_DISP) {
nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN; nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
break; break;
} }
@ -1366,8 +1366,8 @@ nouveau_connector_create(struct drm_device *dev, int index)
break; break;
} }
ret = nvif_notify_init(&disp->disp, nouveau_connector_hotplug, true, ret = nvif_notify_init(&disp->disp.object, nouveau_connector_hotplug,
NV04_DISP_NTFY_CONN, true, NV04_DISP_NTFY_CONN,
&(struct nvif_notify_conn_req_v0) { &(struct nvif_notify_conn_req_v0) {
.mask = NVIF_NOTIFY_CONN_V0_ANY, .mask = NVIF_NOTIFY_CONN_V0_ANY,
.conn = index, .conn = index,

35
drivers/gpu/drm/nouveau/nouveau_display.c
View File

@ -116,7 +116,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos,
bool ret = false; bool ret = false;
do { do {
ret = nvif_mthd(&disp->disp, 0, &args, sizeof(args)); ret = nvif_mthd(&disp->disp.object, 0, &args, sizeof(args));
if (ret != 0) if (ret != 0)
return false; return false;
@ -175,7 +175,7 @@ nouveau_display_vblank_init(struct drm_device *dev)
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
ret = nvif_notify_init(&disp->disp, ret = nvif_notify_init(&disp->disp.object,
nouveau_display_vblank_handler, false, nouveau_display_vblank_handler, false,
NV04_DISP_NTFY_VBLANK, NV04_DISP_NTFY_VBLANK,
&(struct nvif_notify_head_req_v0) { &(struct nvif_notify_head_req_v0) {
@ -454,10 +454,10 @@ nouveau_display_create_properties(struct drm_device *dev)
struct nouveau_display *disp = nouveau_display(dev); struct nouveau_display *disp = nouveau_display(dev);
int gen; int gen;
if (disp->disp.oclass < NV50_DISP) if (disp->disp.object.oclass < NV50_DISP)
gen = 0; gen = 0;
else else
if (disp->disp.oclass < GF110_DISP) if (disp->disp.object.oclass < GF110_DISP)
gen = 1; gen = 1;
else else
gen = 2; gen = 2;
@ -533,31 +533,10 @@ nouveau_display_create(struct drm_device *dev)
drm_kms_helper_poll_disable(dev); drm_kms_helper_poll_disable(dev);
if (nouveau_modeset != 2 && drm->vbios.dcb.entries) { if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
static const u16 oclass[] = { ret = nvif_disp_ctor(&drm->client.device, 0, &disp->disp);
GP102_DISP,
GP100_DISP,
GM200_DISP,
GM107_DISP,
GK110_DISP,
GK104_DISP,
GF110_DISP,
GT214_DISP,
GT206_DISP,
GT200_DISP,
G82_DISP,
NV50_DISP,
NV04_DISP,
};
int i;
for (i = 0, ret = -ENODEV; ret && i < ARRAY_SIZE(oclass); i++) {
ret = nvif_object_init(&drm->client.device.object, 0,
oclass[i], NULL, 0, &disp->disp);
}
if (ret == 0) { if (ret == 0) {
nouveau_display_create_properties(dev); nouveau_display_create_properties(dev);
if (disp->disp.oclass < NV50_DISP) if (disp->disp.object.oclass < NV50_DISP)
ret = nv04_display_create(dev); ret = nv04_display_create(dev);
else else
ret = nv50_display_create(dev); ret = nv50_display_create(dev);
@ -611,7 +590,7 @@ nouveau_display_destroy(struct drm_device *dev)
if (disp->dtor) if (disp->dtor)
disp->dtor(dev); disp->dtor(dev);
nvif_object_fini(&disp->disp); nvif_disp_dtor(&disp->disp);
nouveau_drm(dev)->display = NULL; nouveau_drm(dev)->display = NULL;
kfree(disp); kfree(disp);

3
drivers/gpu/drm/nouveau/nouveau_display.h
View File

@ -2,6 +2,7 @@
#ifndef __NOUVEAU_DISPLAY_H__ #ifndef __NOUVEAU_DISPLAY_H__
#define __NOUVEAU_DISPLAY_H__ #define __NOUVEAU_DISPLAY_H__
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include <nvif/disp.h>
struct nouveau_framebuffer { struct nouveau_framebuffer {
struct drm_framebuffer base; struct drm_framebuffer base;
@ -38,7 +39,7 @@ struct nouveau_display {
int (*init)(struct drm_device *); int (*init)(struct drm_device *);
void (*fini)(struct drm_device *); void (*fini)(struct drm_device *);
struct nvif_object disp; struct nvif_disp disp;
struct drm_property *dithering_mode; struct drm_property *dithering_mode;
struct drm_property *dithering_depth; struct drm_property *dithering_depth;

50
drivers/gpu/drm/nouveau/nv50_display.c
View File

@ -663,7 +663,7 @@ struct nv50_head {
#define nv50_vers(c) nv50_chan(c)->user.oclass #define nv50_vers(c) nv50_chan(c)->user.oclass
struct nv50_disp { struct nv50_disp {
struct nvif_object *disp; struct nvif_disp *disp;
struct nv50_mast mast; struct nv50_mast mast;
struct nouveau_bo *sync; struct nouveau_bo *sync;
@ -1201,7 +1201,7 @@ nv50_curs_new(struct nouveau_drm *drm, struct nv50_head *head,
struct nv50_curs *curs; struct nv50_curs *curs;
int cid, ret; int cid, ret;
cid = nvif_mclass(disp->disp, curses); cid = nvif_mclass(&disp->disp->object, curses);
if (cid < 0) { if (cid < 0) {
NV_ERROR(drm, "No supported cursor immediate class\n"); NV_ERROR(drm, "No supported cursor immediate class\n");
return cid; return cid;
@ -1219,8 +1219,8 @@ nv50_curs_new(struct nouveau_drm *drm, struct nv50_head *head,
return ret; return ret;
} }
ret = nvif_object_init(disp->disp, 0, curses[cid].oclass, &args, ret = nvif_object_init(&disp->disp->object, 0, curses[cid].oclass,
sizeof(args), &curs->chan); &args, sizeof(args), &curs->chan);
if (ret) { if (ret) {
NV_ERROR(drm, "curs%04x allocation failed: %d\n", NV_ERROR(drm, "curs%04x allocation failed: %d\n",
curses[cid].oclass, ret); curses[cid].oclass, ret);
@ -1517,8 +1517,8 @@ nv50_base_new(struct nouveau_drm *drm, struct nv50_head *head,
return ret; return ret;
} }
ret = nv50_base_create(&drm->client.device, disp->disp, base->id, ret = nv50_base_create(&drm->client.device, &disp->disp->object,
disp->sync->bo.offset, &base->chan); base->id, disp->sync->bo.offset, &base->chan);
if (ret) if (ret)
return ret; return ret;
@ -2105,7 +2105,7 @@ nv50_head_atomic_check_lut(struct nv50_head *head,
return; return;
} }
if (disp->disp->oclass < GF110_DISP) { if (disp->disp->object.oclass < GF110_DISP) {
asyh->lut.mode = (asyh->base.cpp == 1) ? 0 : 1; asyh->lut.mode = (asyh->base.cpp == 1) ? 0 : 1;
asyh->set.ilut = true; asyh->set.ilut = true;
} else { } else {
@ -2404,12 +2404,12 @@ nv50_head_create(struct drm_device *dev, int index)
} }
/* allocate overlay resources */ /* allocate overlay resources */
ret = nv50_oimm_create(device, disp->disp, index, &head->oimm); ret = nv50_oimm_create(device, &disp->disp->object, index, &head->oimm);
if (ret) if (ret)
goto out; goto out;
ret = nv50_ovly_create(device, disp->disp, index, disp->sync->bo.offset, ret = nv50_ovly_create(device, &disp->disp->object, index,
&head->ovly); disp->sync->bo.offset, &head->ovly);
if (ret) if (ret)
goto out; goto out;
@ -2435,7 +2435,7 @@ nv50_outp_release(struct nouveau_encoder *nv_encoder)
.base.hashm = nv_encoder->dcb->hashm, .base.hashm = nv_encoder->dcb->hashm,
}; };
nvif_mthd(disp->disp, 0, &args, sizeof(args)); nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
nv_encoder->or = -1; nv_encoder->or = -1;
nv_encoder->link = 0; nv_encoder->link = 0;
} }
@ -2456,7 +2456,7 @@ nv50_outp_acquire(struct nouveau_encoder *nv_encoder)
}; };
int ret; int ret;
ret = nvif_mthd(disp->disp, 0, &args, sizeof(args)); ret = nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
if (ret) { if (ret) {
NV_ERROR(drm, "error acquiring output path: %d\n", ret); NV_ERROR(drm, "error acquiring output path: %d\n", ret);
return ret; return ret;
@ -2618,7 +2618,7 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
if (args.load.data == 0) if (args.load.data == 0)
args.load.data = 340; args.load.data = 340;
ret = nvif_mthd(disp->disp, 0, &args, sizeof(args)); ret = nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
if (ret || !args.load.load) if (ret || !args.load.load)
return connector_status_disconnected; return connector_status_disconnected;
@ -2694,7 +2694,7 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
(0x0100 << nv_crtc->index), (0x0100 << nv_crtc->index),
}; };
nvif_mthd(disp->disp, 0, &args, sizeof(args)); nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
} }
static void static void
@ -2724,7 +2724,7 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
memcpy(args.data, nv_connector->base.eld, sizeof(args.data)); memcpy(args.data, nv_connector->base.eld, sizeof(args.data));
nvif_mthd(disp->disp, 0, &args, nvif_mthd(&disp->disp->object, 0, &args,
sizeof(args.base) + drm_eld_size(args.data)); sizeof(args.base) + drm_eld_size(args.data));
} }
@ -2747,7 +2747,7 @@ nv50_hdmi_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
(0x0100 << nv_crtc->index), (0x0100 << nv_crtc->index),
}; };
nvif_mthd(disp->disp, 0, &args, sizeof(args)); nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
} }
static void static void
@ -2808,7 +2808,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
+ sizeof(args.pwr) + sizeof(args.pwr)
+ args.pwr.avi_infoframe_length + args.pwr.avi_infoframe_length
+ args.pwr.vendor_infoframe_length; + args.pwr.vendor_infoframe_length;
nvif_mthd(disp->disp, 0, &args, size); nvif_mthd(&disp->disp->object, 0, &args, size);
nv50_audio_enable(encoder, mode); nv50_audio_enable(encoder, mode);
} }
@ -2923,7 +2923,7 @@ nv50_msto_prepare(struct nv50_msto *msto)
msto->encoder.name, msto->head->base.base.name, msto->encoder.name, msto->head->base.base.name,
args.vcpi.start_slot, args.vcpi.num_slots, args.vcpi.start_slot, args.vcpi.num_slots,
args.vcpi.pbn, args.vcpi.aligned_pbn); args.vcpi.pbn, args.vcpi.aligned_pbn);
nvif_mthd(&drm->display->disp, 0, &args, sizeof(args)); nvif_mthd(&drm->display->disp.object, 0, &args, sizeof(args));
} }
static int static int
@ -3341,7 +3341,7 @@ nv50_mstm_enable(struct nv50_mstm *mstm, u8 dpcd, int state)
.mst.state = state, .mst.state = state,
}; };
struct nouveau_drm *drm = nouveau_drm(outp->base.base.dev); struct nouveau_drm *drm = nouveau_drm(outp->base.base.dev);
struct nvif_object *disp = &drm->display->disp; struct nvif_object *disp = &drm->display->disp.object;
int ret; int ret;
if (dpcd >= 0x12) { if (dpcd >= 0x12) {
@ -3610,7 +3610,7 @@ nv50_sor_enable(struct drm_encoder *encoder)
lvds.lvds.script |= 0x0200; lvds.lvds.script |= 0x0200;
} }
nvif_mthd(disp->disp, 0, &lvds, sizeof(lvds)); nvif_mthd(&disp->disp->object, 0, &lvds, sizeof(lvds));
break; break;
case DCB_OUTPUT_DP: case DCB_OUTPUT_DP:
if (nv_connector->base.display_info.bpc == 6) if (nv_connector->base.display_info.bpc == 6)
@ -3696,7 +3696,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
struct nvkm_i2c_aux *aux = struct nvkm_i2c_aux *aux =
nvkm_i2c_aux_find(i2c, dcbe->i2c_index); nvkm_i2c_aux_find(i2c, dcbe->i2c_index);
if (aux) { if (aux) {
if (disp->disp->oclass < GF110_DISP) { if (disp->disp->object.oclass < GF110_DISP) {
/* HW has no support for address-only /* HW has no support for address-only
* transactions, so we're required to * transactions, so we're required to
* use custom I2C-over-AUX code. * use custom I2C-over-AUX code.
@ -3709,7 +3709,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
} }
/*TODO: Use DP Info Table to check for support. */ /*TODO: Use DP Info Table to check for support. */
if (disp->disp->oclass >= GF110_DISP) { if (disp->disp->object.oclass >= GF110_DISP) {
ret = nv50_mstm_new(nv_encoder, &nv_connector->aux, 16, ret = nv50_mstm_new(nv_encoder, &nv_connector->aux, 16,
nv_connector->base.base.id, nv_connector->base.base.id,
&nv_encoder->dp.mstm); &nv_encoder->dp.mstm);
@ -4474,13 +4474,13 @@ nv50_display_create(struct drm_device *dev)
goto out; goto out;
/* allocate master evo channel */ /* allocate master evo channel */
ret = nv50_core_create(device, disp->disp, disp->sync->bo.offset, ret = nv50_core_create(device, &disp->disp->object,
&disp->mast); disp->sync->bo.offset, &disp->mast);
if (ret) if (ret)
goto out; goto out;
/* create crtc objects to represent the hw heads */ /* create crtc objects to represent the hw heads */
if (disp->disp->oclass >= GF110_DISP) if (disp->disp->object.oclass >= GF110_DISP)
crtcs = nvif_rd32(&device->object, 0x612004) & 0xf; crtcs = nvif_rd32(&device->object, 0x612004) & 0xf;
else else
crtcs = 0x3; crtcs = 0x3;

1
drivers/gpu/drm/nouveau/nvif/Kbuild
View File

@ -1,6 +1,7 @@
nvif-y := nvif/object.o nvif-y := nvif/object.o
nvif-y += nvif/client.o nvif-y += nvif/client.o
nvif-y += nvif/device.o nvif-y += nvif/device.o
nvif-y += nvif/disp.o
nvif-y += nvif/driver.o nvif-y += nvif/driver.o
nvif-y += nvif/fifo.o nvif-y += nvif/fifo.o
nvif-y += nvif/mem.o nvif-y += nvif/mem.o

59
drivers/gpu/drm/nouveau/nvif/disp.c Normal file
View File

@ -0,0 +1,59 @@
/*
* Copyright 2018 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include <nvif/disp.h>
#include <nvif/device.h>
#include <nvif/class.h>
void
nvif_disp_dtor(struct nvif_disp *disp)
{
nvif_object_fini(&disp->object);
}
int
nvif_disp_ctor(struct nvif_device *device, s32 oclass, struct nvif_disp *disp)
{
static const struct nvif_mclass disps[] = {
{ GP102_DISP, -1 },
{ GP100_DISP, -1 },
{ GM200_DISP, -1 },
{ GM107_DISP, -1 },
{ GK110_DISP, -1 },
{ GK104_DISP, -1 },
{ GF110_DISP, -1 },
{ GT214_DISP, -1 },
{ GT206_DISP, -1 },
{ GT200_DISP, -1 },
{ G82_DISP, -1 },
{ NV50_DISP, -1 },
{ NV04_DISP, -1 },
{}
};
int cid = nvif_sclass(&device->object, disps, oclass);
disp->object.client = NULL;
if (cid < 0)
return cid;
return nvif_object_init(&device->object, 0, disps[cid].oclass,
NULL, 0, &disp->object);
}