Commit d4332da0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Weekly fixes. Seems a little quieter than usual, but still a bunch of
  stuff across the board. Mostly xe, some exynos and nouveau fixes.

  core:
   - Werror Kconfig fix

  panel:
   - add orientation quirk for Aya Neo KUN
   - fix runtime warning on panel/bridge release

  nouveau:
   - remove unused struct
   - fix wq crash on cards with no display

  amdgpu:
   - fix bo release clear page warning

  xe:
   - update MAINTAINERS
   - Use correct forcewake assertions
   - Assert that VRAM provisioning is only done on DGFX
   - Flush render caches before user-fence signalling on all engines
   - Move the disable_c6 call since it was sometimes never called

  exynos:
   - fix regression with fallback mode
   - fix EDID related memory leak
   - remove redundant code

  komeda:
   - fix debugfs conditional compilations
   - check pointer error value

  renesas:
   - atomic shutdown fix

  mediatek:
   - atomic shutdown fix"

* tag 'drm-fixes-2024-06-15' of https://gitlab.freedesktop.org/drm/kernel:
  arm/komeda: Remove all CONFIG_DEBUG_FS conditional compilations
  drm/xe: move disable_c6 call
  drm/xe: flush engine buffers before signalling user fence on all engines
  drm/xe/pf: Assert LMEM provisioning is done only on DGFX
  drm/xe/xe_gt_idle: use GT forcewake domain assertion
  drm/mediatek: Call drm_atomic_helper_shutdown() at shutdown time
  drm: renesas: shmobile: Call drm_atomic_helper_shutdown() at shutdown time
  drm/nouveau: remove unused struct 'init_exec'
  drm/nouveau: don't attempt to schedule hpd_work on headless cards
  drm/amdgpu: Fix the BO release clear memory warning
  drm/bridge/panel: Fix runtime warning on panel bridge release
  drm/komeda: check for error-valued pointer
  drm: panel-orientation-quirks: Add quirk for Aya Neo KUN
  drm/exynos/vidi: fix memory leak in .get_modes()
  drm/exynos: dp: drop driver owner initialization
  drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found
  drm: have config DRM_WERROR depend on !WERROR
  MAINTAINERS: Update Xe driver maintainers
  MAINTAINERS: update Xe driver maintainers
parents 68132b35 9f0a8649

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11034,8 +11034,8 @@ F: include/uapi/drm/i915_drm.h 








INTEL DRM XE DRIVER (Lunar Lake and newer)









M:	Lucas De Marchi <lucas.demarchi@intel.com>









M:	Oded Gabbay <ogabbay@kernel.org>









M:	Thomas Hellström <thomas.hellstrom@linux.intel.com>









M:	Rodrigo Vivi <rodrigo.vivi@intel.com>









L:	intel-xe@lists.freedesktop.org









S:	Supported









W:	https://drm.pages.freedesktop.org/intel-docs/
































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);