From: popcornmix Date: Tue, 13 Jun 2017 14:06:22 +0000 (+0100) Subject: Revert "drm/vc4: Add FB modifier support to firmwarekms." X-Git-Tag: archive/raspbian/4.9.82-1+deb9u3+rpi1_jessie~5^2~193 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7b5a4432db4f71b115f55f3d6cca67c5b3e209a;p=linux-4.9.git Revert "drm/vc4: Add FB modifier support to firmwarekms." This reverts commit 9183dfdbf2cb3ec8e981204847b345f7ab95662d. --- diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c index 40a0cdc179ce..943cbb38f1f2 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -18,7 +18,6 @@ #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" @@ -137,10 +136,6 @@ 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