Commit ce1a67de authored by popcornmix's avatar popcornmix
Browse files

Revert "drm/vc4: Add FB modifier support to firmwarekms." 

This reverts commit 9183dfdb.
parent 8327f281

drivers/gpu/drm/vc4/vc4_firmware_kms.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "drm_atomic_helper.h"

#include "drm_atomic_helper.h"

#include "drm_plane_helper.h"

#include "drm_plane_helper.h"

#include "drm_crtc_helper.h"

#include "drm_crtc_helper.h"

#include "drm_fourcc.h"

#include "linux/clk.h"

#include "linux/clk.h"

#include "linux/debugfs.h"

#include "linux/debugfs.h"

#include "drm_fb_cma_helper.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->yoffset = state->crtc_y;

	fbinfo->base = bo->paddr + fb->offsets[0];

	fbinfo->base = bo->paddr + fb->offsets[0];

	fbinfo->pitch = fb->pitches[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

	/* A bug in the firmware makes it so that if the fb->base is

	 * set to nonzero, the configured pitch gets overwritten with

	 * set to nonzero, the configured pitch gets overwritten with

	 * the previous pitch.  So, to get the configured pitch

	 * the previous pitch.  So, to get the configured pitch