diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-09 18:26:46 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 16:48:41 +0900 |
| commit | ed67936d6e5c1f07f54d8f13bc3accfb9a91d1fe (patch) | |
| tree | f7806a75b2752febbbf37cc7954f3c30450e9268 | |
| parent | 9560c9eb5cc8e0ffb129e62cbc648266b8f51675 (diff) | |
| download | nouveau-ed67936d6e5c1f07f54d8f13bc3accfb9a91d1fe.tar.gz | |
compile with 3.19
| -rw-r--r-- | drm/nouveau/nv50_display.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drm/nouveau/nv50_display.c b/drm/nouveau/nv50_display.c index 0eba5b89d..0a19cc8bc 100644 --- a/drm/nouveau/nv50_display.c +++ b/drm/nouveau/nv50_display.c @@ -1766,8 +1766,12 @@ nv50_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode) drm_edid_to_eld(&nv_connector->base, nv_connector->edid); memcpy(args.data, nv_connector->base.eld, sizeof(args.data)); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) nvif_mthd(disp->disp, 0, &args, sizeof(args.base) + drm_eld_size(args.data)); +#else + nvif_mthd(disp->disp, 0, &args, sizeof(args.base) + args.data[2] * 4); +#endif } static void |