Commit 9f0a8649 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-06-14' of... 

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

 into drm-fixes

drm-misc-fixes for v6.10-rc4:
- Kconfig fix for WERROR.
- Add panel quirk for Aya Neo KUN
- Small bugfixes in komeda, bridge/panel, amdgpu, nouveau.
- Remove unused nouveau struct.
- Call drm_atomic_helper_shutdown for shmobile and mediatek on shutdown.
- Remove DEBUGFS ifdefs from komeda.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/941c0552-3614-4af1-b04a-0a62c99fd7fb@linux.intel.com
parents f1909e85 14731a64

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ config DRM_PRIVACY_SCREEN 
config DRM_WERROR

	bool "Compile the drm subsystem with warnings as errors"

	depends on DRM && EXPERT

	depends on !WERROR

	default n

	help

	  A kernel build should not cause any compiler warnings, and this

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 


	memset(&bp, 0, sizeof(bp));

	*obj = NULL;

	flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;



	bp.size = size;

	bp.byte_align = alignment;

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+0 −2
Original line number Diff line number Diff line
@@ -604,8 +604,6 @@ int amdgpu_bo_create(struct amdgpu_device *adev, 
	if (!amdgpu_bo_support_uswc(bo->flags))

		bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;



	bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;



	bo->tbo.bdev = &adev->mman.bdev;

	if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |

			  AMDGPU_GEM_DOMAIN_GDS))

drivers/gpu/drm/arm/display/komeda/komeda_dev.c

+0 −8
Original line number Diff line number Diff line
@@ -12,10 +12,8 @@ 
#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/dma-mapping.h>

#ifdef CONFIG_DEBUG_FS

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#endif



#include <drm/drm_print.h>
@@ -43,7 +41,6 @@ static int komeda_register_show(struct seq_file *sf, void *x) 


DEFINE_SHOW_ATTRIBUTE(komeda_register);



#ifdef CONFIG_DEBUG_FS

static void komeda_debugfs_init(struct komeda_dev *mdev)

{

	if (!debugfs_initialized())
@@ -55,7 +52,6 @@ static void komeda_debugfs_init(struct komeda_dev *mdev) 
	debugfs_create_x16("err_verbosity", 0664, mdev->debugfs_root,

			   &mdev->err_verbosity);

}

#endif



static ssize_t

core_id_show(struct device *dev, struct device_attribute *attr, char *buf)
@@ -265,9 +261,7 @@ struct komeda_dev *komeda_dev_create(struct device *dev) 


	mdev->err_verbosity = KOMEDA_DEV_PRINT_ERR_EVENTS;



#ifdef CONFIG_DEBUG_FS

	komeda_debugfs_init(mdev);

#endif



	return mdev;
@@ -286,9 +280,7 @@ void komeda_dev_destroy(struct komeda_dev *mdev) 


	sysfs_remove_group(&dev->kobj, &komeda_sysfs_attr_group);



#ifdef CONFIG_DEBUG_FS

	debugfs_remove_recursive(mdev->debugfs_root);

#endif



	if (mdev->aclk)

		clk_prepare_enable(mdev->aclk);

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ komeda_component_get_avail_scaler(struct komeda_component *c, 
	u32 avail_scalers;



	pipe_st = komeda_pipeline_get_state(c->pipeline, state);

	if (!pipe_st)

	if (IS_ERR_OR_NULL(pipe_st))

		return NULL;



	avail_scalers = (pipe_st->active_comps & KOMEDA_PIPELINE_SCALERS) ^