Commit 97aadc16 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-06-19' of... 

Merge tag 'drm-misc-fixes-2025-06-19' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

drm-misc-fixes for v6.16-rc3:
- vivante scheduler fix.
- v3d null pointer crash fix.
- fix backlight, booting GSP-RM, and potential integer shift overflow in nouveau.
- fix compiler warnings about unused linux/export.h
- fix malidp unknown modifier spam.
- fix for ssd130x.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/d44bab7b-01f8-45a8-a7f4-5d3d563d2f9d@linux.intel.com
parents 453e6fd2 61ee19de

Documentation/gpu/nouveau.rst

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ providing a consistent API to upper layers of the driver stack. 
GSP Support

------------------------



.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c

   :doc: GSP message queue element



.. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

drivers/gpu/drm/arm/malidp_planes.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ bool malidp_format_mod_supported(struct drm_device *drm, 
	}



	if (!fourcc_mod_is_vendor(modifier, ARM)) {

		DRM_ERROR("Unknown modifier (not Arm)\n");

		DRM_DEBUG_KMS("Unknown modifier (not Arm)\n");

		return false;

	}

drivers/gpu/drm/ast/ast_mode.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
 */



#include <linux/delay.h>

#include <linux/export.h>

#include <linux/pci.h>



#include <drm/drm_atomic.h>

drivers/gpu/drm/etnaviv/etnaviv_sched.c

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ static enum drm_gpu_sched_stat etnaviv_sched_timedout_job(struct drm_sched_job 
							  *sched_job)

{

	struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job);

	struct drm_gpu_scheduler *sched = sched_job->sched;

	struct etnaviv_gpu *gpu = submit->gpu;

	u32 dma_addr, primid = 0;

	int change;
@@ -89,7 +90,9 @@ static enum drm_gpu_sched_stat etnaviv_sched_timedout_job(struct drm_sched_job 
	return DRM_GPU_SCHED_STAT_NOMINAL;



out_no_timeout:

	list_add(&sched_job->list, &sched_job->sched->pending_list);

	spin_lock(&sched->job_list_lock);

	list_add(&sched_job->list, &sched->pending_list);

	spin_unlock(&sched->job_list_lock);

	return DRM_GPU_SCHED_STAT_NOMINAL;

}

drivers/gpu/drm/mgag200/mgag200_ddc.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
 * Authors: Dave Airlie <airlied@redhat.com>

 */



#include <linux/export.h>

#include <linux/i2c-algo-bit.h>

#include <linux/i2c.h>

#include <linux/pci.h>