diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-16 02:10:32 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 02:25:28 +0200 |
| commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | Merge tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-48f87dd146a480c723774962eca675873a8aa1da.tar.xz linux-48f87dd146a480c723774962eca675873a8aa1da.zip | |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 886079dd9baa..614b32e6381c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -472,9 +472,13 @@ nouveau_display_create(struct drm_device *dev) if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) { dev->mode_config.max_width = 4096; dev->mode_config.max_height = 4096; - } else { + } else + if (drm->device.info.family < NV_DEVICE_INFO_V0_FERMI) { dev->mode_config.max_width = 8192; dev->mode_config.max_height = 8192; + } else { + dev->mode_config.max_width = 16384; + dev->mode_config.max_height = 16384; } dev->mode_config.preferred_depth = 24; |