iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Short summary of fixes pull:

Browse Source 
i915:
 - Fix NULL-pointer deref
 
 imx:
 - dcss: Fix resource-size calculation
 
 firmware:
 - sysfb: Fix returned error code
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmXgRdsACgkQaA3BHVML
 eiONaAgAh9uERcIOfwo3/k0CPBOqGP+6qGlFNBe1W/InryAyFhy0j53VGnrgryjZ
 nD9ea7K0quCuh4Yi3aU7tVqZnEC0A9vXO61vUZ7Jl7fb8sbgQ+ACtFVqolxlRLDn
 FqroaERK9W1Fa0ND6qVj7DgFfQ59YRSmlBA/x9JpxsuZdCoI9vqkPmgl+9b1TV4/
 pzLy9H6yUfCaOSjo/1qoLodmLv3YrF3td9WNKKERVaKK1LNaqiV9Qybo+fsutHcs
 vJ3VVWfm1p1qgNLoTLJ571HEFOEorEhv6OhiCE47SBCXZbJb2Vvhtp3Bt672e6Vy
 xNP+0/5JtyzbRhdBma/quSyV3UdRaw==
 =HRFx
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2024-02-29' of https://anongit.freedesktop.org/git/drm/drm-misc into drm-next

Short summary of fixes pull:

i915:
- Fix NULL-pointer deref

imx:
- dcss: Fix resource-size calculation

firmware:
- sysfb: Fix returned error code

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229085331.GA25863@localhost.localdomain
This commit is contained in:
Dave Airlie 2024-03-01 19:38:08 +10:00
commit c6d6a82d8a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/sysfb.c
View File

@ -127,8 +127,10 @@ static __init int sysfb_init(void)
sysfb_apply_efi_quirks();
parent = sysfb_parent_dev(si);
if (IS_ERR(parent))
if (IS_ERR(parent)) {
ret = PTR_ERR(parent);
goto unlock_mutex;
}
/* try to create a simple-framebuffer device */
compatible = sysfb_parse_mode(si, &mode);

4
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
View File

@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
static void show_heartbeat(const struct i915_request *rq,
struct intel_engine_cs *engine)
{
struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
"heartbeat");
struct drm_printer p =
drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
if (!rq) {
intel_engine_dump(engine, &p,

4
drivers/gpu/drm/imx/dcss/dcss-dev.c
View File

@ -167,7 +167,6 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output)
struct resource *res;
struct dcss_dev *dcss;
const struct dcss_type_data *devtype;
resource_size_t res_len;
devtype = of_device_get_match_data(dev);
if (!devtype) {
@ -181,8 +180,7 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output)
return ERR_PTR(-EINVAL);
}
res_len = res->end - res->start;
if (!devm_request_mem_region(dev, res->start, res_len, "dcss")) {
if (!devm_request_mem_region(dev, res->start, resource_size(res), "dcss")) {
dev_err(dev, "cannot request memory region\n");
return ERR_PTR(-EBUSY);
}