diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-03-14 11:09:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-03-14 11:09:40 +1000 |
| commit | d703575aded2cc371bac6e6fa34f3ac8509c75e4 (patch) | |
| tree | 5339c3aeeb28e0e1ff1cbe2542cd6776115b24f2 /drivers/gpu/drm/gma500/mid_bios.c | |
| parent | 385b64321c4e6a6313f494a25398f940d0ddca32 (diff) | |
| parent | 12d8f318347b1d4feac48e8ac351d3786af39599 (diff) | |
Merge tag 'drm-misc-fixes-2025-03-13' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
A null pointer check for gma500, two clippy fixes for panic, a fix for
an interaction between DPMS and atomic leading to dropped frames, and
a locking fix for dp_mst
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250313-holistic-clay-moose-fead28@houat
Diffstat (limited to 'drivers/gpu/drm/gma500/mid_bios.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/mid_bios.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index 7e76790c6a81..cba97d7db131 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -279,6 +279,11 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv) 0, PCI_DEVFN(2, 0)); int ret = -1; + if (pci_gfx_root == NULL) { + WARN_ON(1); + return; + } + /* Get the address of the platform config vbt */ pci_read_config_dword(pci_gfx_root, 0xFC, &addr); pci_dev_put(pci_gfx_root); |