Skip to content

K
Kernel

openeuler / Kernel
大约 1 年 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 d889c524 编写于 作者: B Ben Skeggs
浏览文件
操作

drm/gt214-/kms: fix hda eld regression 

Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
上级 9506140f
隐藏空白更改
内联 并排
Showing with 10 addition and 8 deletion
drivers/gpu/drm/nouveau/nv50_display.c
浏览文件 @ d889c524
...@@ -1658,15 +1658,17 @@ nv50_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode) ...@@ -1658,15 +1658,17 @@ nv50_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode)
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
struct nouveau_connector *nv_connector; struct nouveau_connector *nv_connector;
struct nv50_disp *disp = nv50_disp(encoder->dev); struct nv50_disp *disp = nv50_disp(encoder->dev);
struct { struct __packed {
struct nv50_disp_mthd_v1 base; struct {
struct nv50_disp_sor_hda_eld_v0 eld; struct nv50_disp_mthd_v1 mthd;
struct nv50_disp_sor_hda_eld_v0 eld;
} base;
u8 data[sizeof(nv_connector->base.eld)]; u8 data[sizeof(nv_connector->base.eld)];
} args = { } args = {
.base.version = 1, .base.mthd.version = 1,
.base.method = NV50_DISP_MTHD_V1_SOR_HDA_ELD, .base.mthd.method = NV50_DISP_MTHD_V1_SOR_HDA_ELD,
.base.hasht = nv_encoder->dcb->hasht, .base.mthd.hasht = nv_encoder->dcb->hasht,
.base.hashm = nv_encoder->dcb->hashm, .base.mthd.hashm = nv_encoder->dcb->hashm,
}; };
nv_connector = nouveau_encoder_connector_get(nv_encoder); nv_connector = nouveau_encoder_connector_get(nv_encoder);
...@@ -1676,7 +1678,7 @@ nv50_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode) ...@@ -1676,7 +1678,7 @@ nv50_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode)
drm_edid_to_eld(&nv_connector->base, nv_connector->edid); drm_edid_to_eld(&nv_connector->base, nv_connector->edid);
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, sizeof(args)); nvif_mthd(disp->disp, 0, &args, sizeof(args.base) + args.data[2] * 4);
} }
static void static void
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或