You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 2767f778820bd7392688512ec2996943a586db6e Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Thu, 30 May 2019 15:55:15 +0100
|
|
Subject: [PATCH] drm/vc4: Max resolution of 7680 is conditional on
|
|
being Pi4
|
|
|
|
The max resolution had been increased from 2048 to 7680 for all
|
|
platforms. This code is common with Pi0-3 which have a max render
|
|
target for GL of 2048, therefore the increased resolution has to
|
|
be conditional on the platform.
|
|
Switch based on whether the bcm2835-v3d node is found, as that is
|
|
not present on Pi4. (There is a potential configuration on Pi0-3
|
|
with no v3d, but this is very unlikely).
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <drm/drm_plane_helper.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include <drm/drm_vblank.h>
|
|
+#include <drm/drm_drv.h>
|
|
|
|
#include "vc4_drv.h"
|
|
#include "vc4_regs.h"
|
|
@@ -536,8 +537,14 @@ int vc4_kms_load(struct drm_device *dev)
|
|
return ret;
|
|
}
|
|
|
|
- dev->mode_config.max_width = 7680;
|
|
- dev->mode_config.max_height = 7680;
|
|
+ if (!drm_core_check_feature(dev, DRIVER_RENDER)) {
|
|
+ /* No V3D as part of vc4. Assume this is Pi4. */
|
|
+ dev->mode_config.max_width = 7680;
|
|
+ dev->mode_config.max_height = 7680;
|
|
+ } else {
|
|
+ dev->mode_config.max_width = 2048;
|
|
+ dev->mode_config.max_height = 2048;
|
|
+ }
|
|
dev->mode_config.funcs = &vc4_mode_funcs;
|
|
dev->mode_config.preferred_depth = 24;
|
|
dev->mode_config.async_page_flip = true;
|