From: Eric Anholt Date: Wed, 7 Jun 2017 21:39:49 +0000 (-0700) Subject: drm/vc4: Add FB modifier support to firmwarekms. X-Git-Tag: archive/raspbian/4.9.82-1+deb9u3+rpi1_jessie~5^2~196 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17e827564830f18a871cdc3cb8da6f85103d2ae9;p=linux-4.9.git drm/vc4: Add FB modifier support to firmwarekms. Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c index 943cbb38f1f2..40a0cdc179ce 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -18,6 +18,7 @@ #include "drm_atomic_helper.h" #include "drm_plane_helper.h" #include "drm_crtc_helper.h" +#include "drm_fourcc.h" #include "linux/clk.h" #include "linux/debugfs.h" #include "drm_fb_cma_helper.h" @@ -136,6 +137,10 @@ static void vc4_primary_plane_atomic_update(struct drm_plane *plane, fbinfo->yoffset = state->crtc_y; fbinfo->base = bo->paddr + fb->offsets[0]; fbinfo->pitch = fb->pitches[0]; + + if (fb->modifier[0] == 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