Commit c6d6a82d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2024-02-29' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229085331.GA25863@localhost.localdomain
parents ca66211a 9cb3542a

drivers/firmware/sysfb.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/imx/dcss/dcss-dev.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

	}