2019-09-19 14:43:19 +00:00
|
|
|
From 94db315153c83753aded66cf3ea1de2b95d37628 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Wed, 7 Jun 2017 14:39:49 -0700
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] drm/vc4: Add FB modifier support to firmwarekms.
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
(cherry picked from commit 11752d73488e08aaeb65fe8289a9c016acde26c2)
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
|
#include "drm/drm_atomic_helper.h"
|
|
|
|
|
#include "drm/drm_plane_helper.h"
|
|
|
|
|
#include "drm/drm_crtc_helper.h"
|
|
|
|
|
+#include "drm/drm_fourcc.h"
|
|
|
|
|
#include "linux/clk.h"
|
|
|
|
|
#include "linux/debugfs.h"
|
|
|
|
|
#include "drm/drm_fb_cma_helper.h"
|
|
|
|
|
@@ -134,6 +135,10 @@ static void vc4_primary_plane_atomic_upd
|
|
|
|
|
fbinfo->yoffset = state->crtc_y;
|
|
|
|
|
fbinfo->base = bo->paddr + fb->offsets[0];
|
|
|
|
|
fbinfo->pitch = fb->pitches[0];
|
|
|
|
|
+
|
|
|
|
|
+ if (fb->modifier == DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED)
|
|
|
|
|
+ fbinfo->bpp |= BIT(31);
|
|
|
|
|
+
|
|
|
|
|
/* A bug in the firmware makes it so that if the fb->base is
|
|
|
|
|
* set to nonzero, the configured pitch gets overwritten with
|
|
|
|
|
* the previous pitch. So, to get the configured pitch
|
