dri-devel Archive on lore.kernel.org
 help / color / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	Sasha Levin <sashal@kernel.org>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.4 002/459] drm/gma500: Fixup fbdev stolen size usage evaluation
Date: Fri, 14 Feb 2020 10:54:12 -0500
Message-ID: <20200214160149.11681-2-sashal@kernel.org> (raw)
In-Reply-To: <20200214160149.11681-1-sashal@kernel.org>

From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

[ Upstream commit fd1a5e521c3c083bb43ea731aae0f8b95f12b9bd ]

psbfb_probe performs an evaluation of the required size from the stolen
GTT memory, but gets it wrong in two distinct ways:
- The resulting size must be page-size-aligned;
- The size to allocate is derived from the surface dimensions, not the fb
  dimensions.

When two connectors are connected with different modes, the smallest will
be stored in the fb dimensions, but the size that needs to be allocated must
match the largest (surface) dimensions. This is what is used in the actual
allocation code.

Fix this by correcting the evaluation to conform to the two points above.
It allows correctly switching to 16bpp when one connector is e.g. 1920x1080
and the other is 1024x768.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191107153048.843881-1-paul.kocialkowski@bootlin.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/gma500/framebuffer.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 218f3bb15276e..90237abee0885 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -462,6 +462,7 @@ static int psbfb_probe(struct drm_fb_helper *helper,
 		container_of(helper, struct psb_fbdev, psb_fb_helper);
 	struct drm_device *dev = psb_fbdev->psb_fb_helper.dev;
 	struct drm_psb_private *dev_priv = dev->dev_private;
+	unsigned int fb_size;
 	int bytespp;
 
 	bytespp = sizes->surface_bpp / 8;
@@ -471,8 +472,11 @@ static int psbfb_probe(struct drm_fb_helper *helper,
 	/* If the mode will not fit in 32bit then switch to 16bit to get
 	   a console on full resolution. The X mode setting server will
 	   allocate its own 32bit GEM framebuffer */
-	if (ALIGN(sizes->fb_width * bytespp, 64) * sizes->fb_height >
-	                dev_priv->vram_stolen_size) {
+	fb_size = ALIGN(sizes->surface_width * bytespp, 64) *
+		  sizes->surface_height;
+	fb_size = ALIGN(fb_size, PAGE_SIZE);
+
+	if (fb_size > dev_priv->vram_stolen_size) {
                 sizes->surface_bpp = 16;
                 sizes->surface_depth = 16;
         }
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply index

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-14 15:54 [PATCH AUTOSEL 5.4 001/459] drm/amdgpu: remove set but not used variable 'mc_shared_chmap' from 'gfx_v6_0.c' and 'gfx_v7_0.c' Sasha Levin
2020-02-14 15:54 ` Sasha Levin [this message]
2020-02-14 15:54 ` [PATCH AUTOSEL 5.4 005/459] drm/qxl: Complete exception handling in qxl_device_init() Sasha Levin
2020-02-14 15:54 ` [PATCH AUTOSEL 5.4 023/459] drm/amd/display: Map ODM memory correctly when doing ODM combine Sasha Levin
2020-02-14 15:54 ` [PATCH AUTOSEL 5.4 031/459] drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() Sasha Levin
2020-02-14 15:54 ` [PATCH AUTOSEL 5.4 032/459] drm/msm/adreno: fix zap vs no-zap handling Sasha Levin
2020-02-14 15:54 ` [PATCH AUTOSEL 5.4 033/459] pxa168fb: Fix the function used to release some memory in an error handling path Sasha Levin
2020-02-14 15:55 ` [PATCH AUTOSEL 5.4 061/459] drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov Sasha Levin
2020-02-14 15:55 ` [PATCH AUTOSEL 5.4 065/459] drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst Sasha Levin
2020-02-14 15:55 ` [PATCH AUTOSEL 5.4 070/459] drm/amd/display: Clear state after exiting fixed active VRR state Sasha Levin
2020-02-14 15:55 ` [PATCH AUTOSEL 5.4 101/459] drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 113/459] drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 119/459] drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 120/459] drm/amdgpu: remove set but not used variable 'dig_connector' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 121/459] drm/amdgpu: remove set but not used variable 'dig' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 122/459] drm/amdgpu: remove always false comparison in 'amdgpu_atombios_i2c_process_i2c_ch' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 123/459] drm/amdgpu: remove set but not used variable 'mc_shared_chmap' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 124/459] drm/amd/powerplay: remove set but not used variable 'vbios_version', 'data' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 125/459] drm/amd/powerplay: remove set but not used variable 'data' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 126/459] drm/amd/powerplay: remove set but not used variable 'threshold', 'state' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 127/459] drm/amdgpu: remove set but not used variable 'amdgpu_connector' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 128/459] drm/amdgpu: remove set but not used variable 'count' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 129/459] drm/amdgpu: remove set but not used variable 'invalid' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 130/459] drm/amd/powerplay: remove set but not used variable 'us_mvdd' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 131/459] drm/gma500: remove set but not used variable 'htotal' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 132/459] drm/gma500: remove set but not used variable 'error' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 133/459] drm/gma500: remove set but not used variable 'is_hdmi', 'is_crt' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 134/459] drm/gma500: remove set but not used variable 'channel_eq' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 135/459] drm/amdkfd: remove set but not used variable 'top_dev' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 136/459] drm/amd/display: remove set but not used variable 'old_plane_crtc' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 137/459] drm/amd/display: remove set but not used variable 'bp' in bios_parser2.c Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 138/459] drm/amd/display: remove set but not used variable 'bp' in bios_parser.c Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 139/459] drm/radeon: remove set but not used variable 'size', 'relocs_chunk' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 140/459] drm/radeon: remove set but not used variable 'backbias_response_time' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 141/459] drm/radeon: remove set but not used variable 'dig_connector' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 142/459] drm/radeon: remove set but not used variable 'radeon_connector' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 143/459] drm/radeon: remove set but not used variable 'blocks' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 144/459] drm/radeon: remove set but not used variable 'tv_pll_cntl1' Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 146/459] drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG Sasha Levin
2020-02-14 15:56 ` [PATCH AUTOSEL 5.4 147/459] drm/panel: simple: Add Logic PD Type 28 display support Sasha Levin
2020-02-14 15:57 ` [PATCH AUTOSEL 5.4 182/459] gpu/drm: ingenic: Avoid null pointer deference in plane atomic update Sasha Levin
2020-02-14 15:57 ` [PATCH AUTOSEL 5.4 204/459] drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV Sasha Levin
2020-02-14 15:57 ` [PATCH AUTOSEL 5.4 212/459] drm/mediatek: handle events when enabling/disabling crtc Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 234/459] drm/fbdev: Fallback to non tiled mode if all tiles not present Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 239/459] fbdev: fix numbering of fbcon options Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 255/459] drm/amdkfd: Fix permissions of hang_hws Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 258/459] drm: remove the newline for CRC source name Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 260/459] drm/gma500: remove set but not used variables 'hist_reg' Sasha Levin
2020-02-14 15:58 ` [PATCH AUTOSEL 5.4 270/459] drm/mediatek: Add gamma property according to hardware capability Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 309/459] drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 310/459] drm/nouveau/gr/gk20a, gm200-: add terminators to method lists read from fw Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 311/459] drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 312/459] drm/nouveau/drm/ttm: Remove set but not used variable 'mem' Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 313/459] drm/nouveau/fault/gv100-: fix memory leak on module unload Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 316/459] drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add Sasha Levin
2020-02-14 15:59 ` [PATCH AUTOSEL 5.4 337/459] drm/amd/display: fixup DML dependencies Sasha Levin
2020-02-14 16:00 ` [PATCH AUTOSEL 5.4 379/459] drm/nouveau/mmu: fix comptag memory leak Sasha Levin
2020-02-14 16:00 ` [PATCH AUTOSEL 5.4 380/459] drm/nouveau/kms/nv50: remove set but not unused variable 'nv_connector' Sasha Levin
2020-02-14 16:01 ` [PATCH AUTOSEL 5.4 422/459] drm/amd/display: do not allocate display_mode_lib unnecessarily Sasha Levin
2020-02-14 16:01 ` [PATCH AUTOSEL 5.4 424/459] drm/nouveau/disp/nv50-: prevent oops when no channel method map provided Sasha Levin
2020-02-14 16:01 ` [PATCH AUTOSEL 5.4 429/459] radeon: insert 10ms sleep in dce5_crtc_load_lut Sasha Levin
2020-02-14 16:01 ` [PATCH AUTOSEL 5.4 449/459] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency Sasha Levin
2020-02-14 16:01 ` [PATCH AUTOSEL 5.4 450/459] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200214160149.11681-2-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paul.kocialkowski@bootlin.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

dri-devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dri-devel/0 dri-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dri-devel dri-devel/ https://lore.kernel.org/dri-devel \
		dri-devel@lists.freedesktop.org
	public-inbox-index dri-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.dri-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git