diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 16:55:45 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 16:55:45 +0900 |
| commit | 1ee7604356efbed5e359c317e40937316895087f (patch) | |
| tree | bcc091f439697bb270a6f927e67167494ca23363 /drm/nouveau/dispnv04/dfp.c | |
| parent | 6fff91ffe285b6a6c8b0663dca0382acf5790d74 (diff) | |
| parent | 2309eccb2cd0491ae3aedaaf3505461cb189bdfe (diff) | |
| download | nouveau-1ee7604356efbed5e359c317e40937316895087f.tar.gz | |
Merge branch 'compat-3.18' into tegra-3.18tegra-3.18
Diffstat (limited to 'drm/nouveau/dispnv04/dfp.c')
| -rw-r--r-- | drm/nouveau/dispnv04/dfp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drm/nouveau/dispnv04/dfp.c b/drm/nouveau/dispnv04/dfp.c index 05bfd151d..3f88afa4e 100644 --- a/drm/nouveau/dispnv04/dfp.c +++ b/drm/nouveau/dispnv04/dfp.c @@ -705,7 +705,11 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry) nv_encoder->dcb = entry; nv_encoder->or = ffs(entry->or) - 1; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) drm_encoder_init(connector->dev, encoder, &nv04_dfp_funcs, type, NULL); +#else + drm_encoder_init(connector->dev, encoder, &nv04_dfp_funcs, type); +#endif drm_encoder_helper_add(encoder, helper); encoder->possible_crtcs = entry->heads; |