Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba99b3df authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "drm/drm_fb_helper: fix fbdev with sparc64" 



This reverts commit 4bba72b7 which is
commit 2a1658bf922ffd9b7907e270a7d9cdc9643fc45d upstream.

It breaks the abi of some Android drivers and can be safely reverted as
Android does not currently run on sparc64 systems :)

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5245629207bf163908a72aeea92495494b71e92c
parent 3a9b53bc

drivers/gpu/drm/bochs/bochs_kms.c

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ int bochs_kms_init(struct bochs_device *bochs) 
	bochs->dev->mode_config.preferred_depth = 24;

	bochs->dev->mode_config.prefer_shadow = 0;

	bochs->dev->mode_config.prefer_shadow_fbdev = 1;

	bochs->dev->mode_config.fbdev_use_iomem = true;

	bochs->dev->mode_config.quirk_addfb_prefer_host_byte_order = true;



	bochs->dev->mode_config.funcs = &bochs_mode_funcs;

drivers/gpu/drm/drm_fb_helper.c

+1 −5
Original line number Diff line number Diff line
@@ -390,11 +390,7 @@ static void drm_fb_helper_dirty_blit_real(struct drm_fb_helper *fb_helper, 
	unsigned int y;



	for (y = clip->y1; y < clip->y2; y++) {

		if (!fb_helper->dev->mode_config.fbdev_use_iomem)

		memcpy(dst, src, len);

		else

			memcpy_toio((void __iomem *)dst, src, len);



		src += fb->pitches[0];

		dst += fb->pitches[0];

	}

include/drm/drm_mode_config.h

+0 −12
Original line number Diff line number Diff line
@@ -865,18 +865,6 @@ struct drm_mode_config { 
	 */

	bool prefer_shadow_fbdev;



	/**

	 * @fbdev_use_iomem:

	 *

	 * Set to true if framebuffer reside in iomem.

	 * When set to true memcpy_toio() is used when copying the framebuffer in

	 * drm_fb_helper.drm_fb_helper_dirty_blit_real().

	 *

	 * FIXME: This should be replaced with a per-mapping is_iomem

	 * flag (like ttm does), and then used everywhere in fbdev code.

	 */

	bool fbdev_use_iomem;



	/**

	 * @quirk_addfb_prefer_xbgr_30bpp:

	 *