dri-devel February 2021

dri-devel@lists.freedesktop.org

314 participants
684 discussions

[PATCH] drm/xen: adjust Kconfig
by Jan Beulich 01 Mar '21

01 Mar '21

By having selected DRM_XEN, I was assuming I would build the frontend driver. As it turns out this is a dummy option, and I have really not been building this (because I had DRM disabled). Make it a promptless one, moving the "depends on" to the other, real option, and "select"ing the dummy one. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> --- a/drivers/gpu/drm/xen/Kconfig +++ b/drivers/gpu/drm/xen/Kconfig @@ -1,15 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_XEN - bool "DRM Support for Xen guest OS" - depends on XEN - help - Choose this option if you want to enable DRM support - for Xen. + bool config DRM_XEN_FRONTEND tristate "Para-virtualized frontend driver for Xen guest OS" - depends on DRM_XEN - depends on DRM + depends on XEN && DRM + select DRM_XEN select DRM_KMS_HELPER select VIDEOMODE_HELPERS select XEN_XENBUS_FRONTEND

3 3

Re: [Intel-gfx] [PATCH 18/18] drm/i915/display13: Enabling dithering after the CC1 pipe
by Ville Syrjälä 01 Mar '21

01 Mar '21

On Thu, Jan 28, 2021 at 11:24:13AM -0800, Matt Roper wrote: > From: Nischal Varide <nischal.varide(a)intel.com> > > If the panel is 12bpc then Dithering is not enabled in the Legacy > dithering block , instead its Enabled after the C1 CC1 pipe post > color space conversion.For a 6bpc pannel Dithering is enabled in > Legacy block. Dithering is probably going to require a whole uapi bikeshed. Not sure we can just enable it unilaterally. Ccing dri-devel, and Mario who had issues with dithering in the past... > > Cc: Uma Shankar <uma.shankar(a)intel.com> > Signed-off-by: Nischal Varide <nischal.varide(a)intel.com> > Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem(a)intel.com> > Signed-off-by: Matt Roper <matthew.d.roper(a)intel.com> > --- > drivers/gpu/drm/i915/display/intel_color.c | 16 ++++++++++++++++ > drivers/gpu/drm/i915/display/intel_display.c | 9 ++++++++- > drivers/gpu/drm/i915/i915_reg.h | 3 ++- > 3 files changed, 26 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c > index ff7dcb7088bf..9a0572bbc5db 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.c > +++ b/drivers/gpu/drm/i915/display/intel_color.c > @@ -1604,6 +1604,20 @@ static u32 icl_csc_mode(const struct intel_crtc_state *crtc_state) > return csc_mode; > } > > +static u32 dither_after_cc1_12bpc(const struct intel_crtc_state *crtc_state) > +{ > + u32 gamma_mode = crtc_state->gamma_mode; > + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > + > + if (HAS_DISPLAY13(i915)) { > + if (!crtc_state->dither_force_disable && > + (crtc_state->pipe_bpp == 36)) > + gamma_mode |= GAMMA_MODE_DITHER_AFTER_CC1; > + } > + > + return gamma_mode; > +} > + > static int icl_color_check(struct intel_crtc_state *crtc_state) > { > int ret; > @@ -1614,6 +1628,8 @@ static int icl_color_check(struct intel_crtc_state *crtc_state) > > crtc_state->gamma_mode = icl_gamma_mode(crtc_state); > > + crtc_state->gamma_mode = dither_after_cc1_12bpc(crtc_state); > + > crtc_state->csc_mode = icl_csc_mode(crtc_state); > > crtc_state->preload_luts = intel_can_preload_luts(crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 4dc4b1be0809..e3dbcd956fc6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -8098,9 +8098,15 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state) > break; > } > > - if (crtc_state->dither) > + /* > + * If 12bpc panel then, Enables dithering after the CC1 pipe > + * post color space conversion and not here > + */ > + > + if (crtc_state->dither && (crtc_state->pipe_bpp != 36)) > val |= PIPEMISC_DITHER_ENABLE | PIPEMISC_DITHER_TYPE_SP; > > + > if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) > val |= PIPEMISC_OUTPUT_COLORSPACE_YUV; > @@ -10760,6 +10766,7 @@ intel_modeset_pipe_config(struct intel_atomic_state *state, > */ > pipe_config->dither = (pipe_config->pipe_bpp == 6*3) && > !pipe_config->dither_force_disable; > + > drm_dbg_kms(&i915->drm, > "hw max bpp: %i, pipe bpp: %i, dithering: %i\n", > base_bpp, pipe_config->pipe_bpp, pipe_config->dither); > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 128b835c0adb..27f25214a839 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -6132,7 +6132,7 @@ enum { > #define PIPEMISC_DITHER_8_BPC (0 << 5) > #define PIPEMISC_DITHER_10_BPC (1 << 5) > #define PIPEMISC_DITHER_6_BPC (2 << 5) > -#define PIPEMISC_DITHER_12_BPC (3 << 5) > +#define PIPEMISC_DITHER_12_BPC (4 << 5) > #define PIPEMISC_DITHER_ENABLE (1 << 4) > #define PIPEMISC_DITHER_TYPE_MASK (3 << 2) > #define PIPEMISC_DITHER_TYPE_SP (0 << 2) > @@ -7668,6 +7668,7 @@ enum { > #define GAMMA_MODE_MODE_12BIT (2 << 0) > #define GAMMA_MODE_MODE_SPLIT (3 << 0) /* ivb-bdw */ > #define GAMMA_MODE_MODE_12BIT_MULTI_SEGMENTED (3 << 0) /* icl + */ > +#define GAMMA_MODE_DITHER_AFTER_CC1 (1 << 26) > > /* DMC/CSR */ > #define CSR_PROGRAM(i) _MMIO(0x80000 + (i) * 4) > -- > 2.25.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel

4 4

[PATCH] drivers: gnu: drm: i915: gvt: Fixed couple of spellings in the file gtt.c
by Bhaskar Chowdhury 01 Mar '21

01 Mar '21

s/negtive/negative/ s/possilbe/possible/ Signed-off-by: Bhaskar Chowdhury <unixbhaskar(a)gmail.com> --- drivers/gpu/drm/i915/gvt/gtt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 897c007ea96a..dc5834bf4de2 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1159,8 +1159,8 @@ static inline void ppgtt_generate_shadow_entry(struct intel_gvt_gtt_entry *se, * @vgpu: target vgpu * @entry: target pfn's gtt entry * - * Return 1 if 2MB huge gtt shadowing is possilbe, 0 if miscondition, - * negtive if found err. + * Return 1 if 2MB huge gtt shadowing is possible, 0 if miscondition, + * negative if found err. */ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, struct intel_gvt_gtt_entry *entry) -- 2.26.2

3 3

[PATCH] Revert "drm/nouveau: fix dma syncing warning with debugging on."
by Tobias 28 Feb '21

28 Feb '21

This reverts commit f295c8cfec833c2707ff1512da10d65386dde7af. Starting with commit f295c8cfec833c2707ff1512da10d65386dde7af ("drm/nouveau: fix dma syncing warning with debugging on.") the following oops occures: BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 6 PID: 1013 Comm: Xorg.bin Tainted: G E 5.11.0-desktop-rc0+ #2 Hardware name: Acer Aspire VN7-593G/Pluto_KLS, BIOS V1.11 08/01/2018 RIP: 0010:nouveau_bo_sync_for_device+0x40/0xb0 [nouveau] Call Trace: nouveau_bo_validate+0x5d/0x80 [nouveau] nouveau_gem_ioctl_pushbuf+0x662/0x1120 [nouveau] ? nouveau_gem_ioctl_new+0xf0/0xf0 [nouveau] drm_ioctl_kernel+0xa6/0xf0 [drm] drm_ioctl+0x1f4/0x3a0 [drm] ? nouveau_gem_ioctl_new+0xf0/0xf0 [nouveau] nouveau_drm_ioctl+0x50/0xa0 [nouveau] __x64_sys_ioctl+0x7e/0xb0 do_syscall_64+0x33/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae ---[ end trace ccfb1e7f4064374f ]--- RIP: 0010:nouveau_bo_sync_for_device+0x40/0xb0 [nouveau] Reverting the commit, fixes the issue! Signed-off-by: Tobias Klausmann <tobias.klausmann(a)freenet.de> --- drivers/gpu/drm/nouveau/nouveau_bo.c | 35 +++++----------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 2375711877cf..33dc886d1d6d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -547,7 +547,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) { struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; - int i, j; + int i; if (!ttm_dma) return; @@ -556,21 +556,10 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) if (nvbo->force_coherent) return; - for (i = 0; i < ttm_dma->num_pages; ++i) { - struct page *p = ttm_dma->pages[i]; - size_t num_pages = 1; - - for (j = i + 1; j < ttm_dma->num_pages; ++j) { - if (++p != ttm_dma->pages[j]) - break; - - ++num_pages; - } + for (i = 0; i < ttm_dma->num_pages; i++) dma_sync_single_for_device(drm->dev->dev, ttm_dma->dma_address[i], - num_pages * PAGE_SIZE, DMA_TO_DEVICE); - i += num_pages; - } + PAGE_SIZE, DMA_TO_DEVICE); } void @@ -578,7 +567,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) { struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm; - int i, j; + int i; if (!ttm_dma) return; @@ -587,21 +576,9 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) if (nvbo->force_coherent) return; - for (i = 0; i < ttm_dma->num_pages; ++i) { - struct page *p = ttm_dma->pages[i]; - size_t num_pages = 1; - - for (j = i + 1; j < ttm_dma->num_pages; ++j) { - if (++p != ttm_dma->pages[j]) - break; - - ++num_pages; - } - + for (i = 0; i < ttm_dma->num_pages; i++) dma_sync_single_for_cpu(drm->dev->dev, ttm_dma->dma_address[i], - num_pages * PAGE_SIZE, DMA_FROM_DEVICE); - i += num_pages; - } + PAGE_SIZE, DMA_FROM_DEVICE); } void nouveau_bo_add_io_reserve_lru(struct ttm_buffer_object *bo) -- 2.30.1

1 0

What ist the standard way to define connector type and bus format with device tree?
by H. Nikolaus Schaller 28 Feb '21

28 Feb '21

Hi, according to bindings/display/panel/panel-common.yaml and by using "panel-simple" as compatible string we can define almost all properties of a DSI panel by a device tree entry. Except the connector and bus format which can only be set by adding the same information to the panel-simple tables. This leads to big problems because DRM can't match the display with any lcd controller. The least issue is a warning: [ 0.313431] panel-simple claa070vc01: Specify missing connector_type Are we missing some documentation or code that reads some "connector-type" and "bus-format" property? BR and thanks, Nikolaus

1 2

[PATCH v6 0/3] GUD USB Display driver
by Noralf Trønnes 28 Feb '21

28 Feb '21

Hi, A while back I had the idea to turn a Raspberry Pi Zero into a $5 USB to HDMI/SDTV/DPI display adapter. The protocol is open so people are free to make displays implementing it and use this driver, all that's needed is to add a USB vid:pid to the driver for the display. See the wiki[1] for more information and images for the Raspberry Pi Zero/4. Changes in this version: - Use obj-y in Makefile (Peter) - Fix missing le32_to_cpu() when using GUD_DISPLAY_MAGIC (Peter) - Set initial brightness on backlight device Noralf. [1] https://github.com/notro/gud/wiki Noralf Trønnes (3): drm/uapi: Add USB connector type drm/probe-helper: Check epoch counter in output_poll_execute() drm: Add GUD USB Display driver MAINTAINERS | 8 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_connector.c | 1 + drivers/gpu/drm/drm_probe_helper.c | 7 +- drivers/gpu/drm/gud/Kconfig | 14 + drivers/gpu/drm/gud/Makefile | 4 + drivers/gpu/drm/gud/gud_connector.c | 738 ++++++++++++++++++++++++++++ drivers/gpu/drm/gud/gud_drv.c | 625 +++++++++++++++++++++++ drivers/gpu/drm/gud/gud_internal.h | 149 ++++++ drivers/gpu/drm/gud/gud_pipe.c | 475 ++++++++++++++++++ include/drm/gud.h | 356 ++++++++++++++ include/uapi/drm/drm_mode.h | 1 + 13 files changed, 2380 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/gud/Kconfig create mode 100644 drivers/gpu/drm/gud/Makefile create mode 100644 drivers/gpu/drm/gud/gud_connector.c create mode 100644 drivers/gpu/drm/gud/gud_drv.c create mode 100644 drivers/gpu/drm/gud/gud_internal.h create mode 100644 drivers/gpu/drm/gud/gud_pipe.c create mode 100644 include/drm/gud.h -- 2.23.0

2 12

[PATCH 12/11] pragma once: scripted treewide conversion
by Alexey Dobriyan 28 Feb '21

28 Feb '21

[ Bcc a lot of lists so that people understand what's this is all ] [ about without creating uber-cc-thread. ] [ Apologies if I missed your subsystem ] [ Please see [PATCH 11/11: pragma once: conversion script (in Python 2)] ] Hi, Linus. Please run the script below from top-level directory, it will convert most kernel headers to #pragma once directive advancing them into 21-st century. The advantages are: * less LOC 18087 files changed, 18878 insertions(+), 99804 deletions(-) = -81 kLOC (give or take) * less mental tax on developers forced to name things which aren't even real code * less junk in preprocessor hashtables and editors/IDEs autocompletion lists There are two bit exceptions: UAPI headers and ACPICA. Given ubiquity of #pragma once, I personally think even these subsystems should be converted in the future. Compile tested on alpha, arc, arm, arm64, h8300, ia64, m68k, microblaze, mips, nios2, parisc, powerpc, riscv, s390, sh, sparc, um-i386, um-x86_64, i386, x86_64, xtensa (allnoconfig, all defconfigs, allmodconfig with or without SMP/DEBUG_KERNEL + misc stuff). Not compile tested on csky, hexagon, nds32, openrisc. Love, Alexey Signed-off-by: Alexey Dobriyan <adobriyan(a)gmail.com> #!/bin/sh -x find . -type f -name '*.h' -print |\ LC_ALL=C sort |\ sed -e 's#^./##g' |\ xargs ./scripts/pragma-once.py find . -type d -name 'uapi' | xargs git checkout -f git checkout -f arch/alpha/include/asm/cmpxchg.h git checkout -f arch/arm/mach-imx/hardware.h git checkout -f arch/arm/mach-ixp4xx/include/mach/hardware.h git checkout -f arch/arm/mach-sa1100/include/mach/hardware.h git checkout -f arch/mips/include/asm/mips-cps.h git checkout -f arch/x86/boot/boot.h git checkout -f arch/x86/boot/ctype.h git checkout -f arch/x86/include/asm/cpufeatures.h git checkout -f arch/x86/include/asm/disabled-features.h git checkout -f arch/x86/include/asm/required-features.h git checkout -f arch/x86/include/asm/vmxfeatures.h git checkout -f arch/x86/include/asm/vvar.h git checkout -f drivers/acpi/acpica/ git checkout -f drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h git checkout -f drivers/gpu/drm/amd/pm/powerplay/ppsmc.h git checkout -f drivers/input/misc/yealink.h git checkout -f drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h git checkout -f drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h git checkout -f drivers/pcmcia/yenta_socket.h git checkout -f drivers/staging/rtl8723bs/include/hal_com_h2c.h git checkout -f include/linux/acpi.h git checkout -f include/linux/bitops.h git checkout -f include/linux/compiler_types.h git checkout -f include/linux/device.h git checkout -f include/linux/kbuild.h git checkout -f include/linux/libfdt_env.h git checkout -f include/linux/local_lock.h git checkout -f include/linux/spinlock.h git checkout -f include/linux/spinlock_api_smp.h git checkout -f include/linux/spinlock_types.h git checkout -f include/linux/tracepoint.h git checkout -f mm/gup_test.h git checkout -f net/batman-adv/main.h git checkout -f scripts/dtc/ git checkout -f tools/include/linux/bitops.h git checkout -f tools/include/linux/compiler.h git checkout -f tools/testing/selftests/clone3/clone3_selftests.h git checkout -f tools/testing/selftests/futex/include/atomic.h git checkout -f tools/testing/selftests/futex/include/futextest.h git checkout -f tools/testing/selftests/futex/include/logging.h git checkout -f tools/testing/selftests/kselftest.h git checkout -f tools/testing/selftests/kselftest_harness.h git checkout -f tools/testing/selftests/pidfd/pidfd.h git checkout -f tools/testing/selftests/x86/helpers.h

1 0

[PATCH] drm/msm/dsi: Uncomment core_mmss clock for MSM8996
by Konrad Dybcio 28 Feb '21

28 Feb '21

From: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)somainline.org> The MSM8996 core_mmss clock was commented out due to some strange issues that others were experiencing. At least SONY Tone family is working perfectly fine with this clock declared and gets it up and running without any error. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)somainline.org> Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index b2ff68a15791..f3f1c03c7db9 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -106,12 +106,8 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .num_dsi = 2, }; -/* - * TODO: core_mmss_clk fails to enable for some reason, but things work fine - * without it too. Figure out why it doesn't enable and uncomment below - */ static const char * const dsi_8996_bus_clk_names[] = { - "mdp_core", "iface", "bus", /* "core_mmss", */ + "mdp_core", "iface", "bus", "core_mmss", }; static const struct msm_dsi_config msm8996_dsi_cfg = { -- 2.30.1

1 0

[PATCH] drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
by Konrad Dybcio 28 Feb '21

28 Feb '21

While passing the A530-specific lm_setup func to A530 and A540 to !A530 was fine back when only these two were supported, it certainly is not a good idea to send A540 specifics to smaller GPUs like A508 and friends. Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c index f176a6f3eff6..e58670a61df4 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_power.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c @@ -304,7 +304,7 @@ int a5xx_power_init(struct msm_gpu *gpu) /* Set up the limits management */ if (adreno_is_a530(adreno_gpu)) a530_lm_setup(gpu); - else + else if (adreno_is_a540(adreno_gpu)) a540_lm_setup(gpu); /* Set up SP/TP power collpase */ -- 2.30.1

1 0

[PATCH] video: fbdev: sis: catch out of bounds in SiS_DoCalcDelay
by Tong Zhang 28 Feb '21

28 Feb '21

idx1 is read from hardware and the range is [0, 30], the size of ThLowA and ThLowB is 24, so there could possibly an out of bounds access. This patch catches the OOB access and print a warning. [ 4.771691] ================================================================== [ 4.771693] BUG: KASAN: global-out-of-bounds in SiS_DoCalcDelay+0xa9/0x160 [sisfb] [ 4.771718] Read of size 1 at addr ffffffffc0048b1f by task modprobe/96 [ 4.771722] CPU: 0 PID: 96 Comm: modprobe Not tainted 5.11.0-rc7 #92 [ 4.771727] Call Trace: [ 4.771729] dump_stack+0x7d/0xa3 [ 4.771733] print_address_description.constprop.0+0x1a/0x140 [ 4.771738] ? SiS_DoCalcDelay+0xa9/0x160 [sisfb] [ 4.771760] ? SiS_DoCalcDelay+0xa9/0x160 [sisfb] [ 4.771782] kasan_report.cold+0x7f/0x10e [ 4.771786] ? SiS_DoCalcDelay+0xa9/0x160 [sisfb] [ 4.771808] SiS_DoCalcDelay+0xa9/0x160 [sisfb] [ 4.771830] ? SiS_GetFIFOThresholdIndex300+0xb0/0xb0 [sisfb] [ 4.771853] ? sisfb_probe.cold+0x3a0f/0x4f7d [sisfb] [ 4.771876] ? SiS_GetRefCRTVCLK+0x6c/0x80 [sisfb] [ 4.771900] ? SiS_GetVCLK2Ptr+0x28b/0x800 [sisfb] [ 4.771923] SiSSetMode+0x26de/0x4770 [sisfb] [ 4.771946] ? SiS_LoadDAC+0x3e0/0x3e0 [sisfb] [ 4.771968] ? ___slab_alloc+0x412/0x5d0 [ 4.771971] ? set_inverse_trans_unicode.isra.0+0x147/0x170 [ 4.771975] ? sisfb_syncaccel+0x12f/0x140 [sisfb] [ 4.771998] sisfb_set_mode.isra.0+0x264/0x12b0 [sisfb] [ 4.772020] ? kasan_module_alloc+0x5f/0xc0 [ 4.772023] sisfb_set_par+0x3b3/0x930 [sisfb] [ 4.772046] fbcon_init+0x447/0x980 [ 4.772049] ? sisfb_probe+0x1490/0x1490 [sisfb] [ 4.772071] visual_init+0x182/0x240 [ 4.772074] do_bind_con_driver+0x2db/0x460 [ 4.772078] do_take_over_console+0x205/0x280 [ 4.772082] do_fbcon_takeover+0x80/0x100 [ 4.772085] register_framebuffer+0x301/0x4c0 [ 4.772088] ? do_remove_conflicting_framebuffers+0xf0/0xf0 [ 4.772092] ? fb_copy_cmap+0x10b/0x160 [ 4.772096] sisfb_probe.cold+0x2fca/0x4f7d [sisfb] [ 4.772120] ? rpm_resume+0x1cd/0xac0 [ 4.772124] ? sisfb_check_var+0x990/0x990 [sisfb] [ 4.772146] ? pm_runtime_get_if_active+0x190/0x190 [ 4.772150] ? _raw_spin_lock_irqsave+0x7b/0xd0 [ 4.772154] ? _raw_spin_lock_irqsave+0x7b/0xd0 [ 4.772157] ? __mutex_lock_slowpath+0x10/0x10 [ 4.772161] ? sisfb_check_var+0x990/0x990 [sisfb] [ 4.772183] local_pci_probe+0x6f/0xb0 [ 4.772349] The buggy address belongs to the variable: [ 4.772350] ThLowA.47581+0x1f/0xffffffffffff9500 [sisfb] [ 4.772373] [ 4.772373] Memory state around the buggy address: [ 4.772375] ffffffffc0048a00: 00 00 00 00 f9 f9 f9 f9 00 00 f9 f9 f9 f9 f9 f9 [ 4.772377] ffffffffc0048a80: 00 00 05 f9 f9 f9 f9 f9 00 00 f9 f9 f9 f9 f9 f9 [ 4.772379] >ffffffffc0048b00: 00 00 00 f9 f9 f9 f9 f9 00 04 f9 f9 f9 f9 f9 f9 [ 4.772380] ^ [ 4.772382] ffffffffc0048b80: 00 00 00 00 00 00 f9 f9 f9 f9 f9 f9 00 07 f9 f9 [ 4.772384] ffffffffc0048c00: f9 f9 f9 f9 00 00 00 f9 f9 f9 f9 f9 00 f9 f9 f9 [ 4.772385] ================================================================== Signed-off-by: Tong Zhang <ztong0001(a)gmail.com> --- drivers/video/fbdev/sis/init.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c index b568c646a76c..fb9815e7af4b 100644 --- a/drivers/video/fbdev/sis/init.c +++ b/drivers/video/fbdev/sis/init.c @@ -2249,6 +2249,10 @@ SiS_GetFIFOThresholdA300(unsigned short idx1, unsigned short idx2) 34, 3,37, 5,47, 7, 67,11 }; + if (idx1>22) { + printk(KERN_WARNING "idx1 out of bounds: %d\n", idx1); + idx1 = 22; + } return (unsigned short)((ThLowA[idx1 + 1] * idx2) + ThLowA[idx1]); } @@ -2261,6 +2265,10 @@ SiS_GetFIFOThresholdB300(unsigned short idx1, unsigned short idx2) 42, 4,45, 6,55, 8, 75,12 }; + if (idx1>22) { + printk(KERN_WARNING "idx1 out of bounds: %d\n", idx1); + idx1 = 22; + } return (unsigned short)((ThLowB[idx1 + 1] * idx2) + ThLowB[idx1]); } -- 2.25.1

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2021