In-flight collision: DRM_AMD_DC_DCN renaming
Dear Michael, dear Harry, dear Alex,
The commit 4652ae7a51b7 ("drm/amd/display: Rename DCN config to FP")
renames config DRM_AMD_DC_DCN to config DRM_AMD_DC_FP. The concurrent
commit 78f0929884d4 ("powerpc/64: Always build with 128-bit long
double") overrides the renaming change for the select in config
DRM_AMD_DC, and this leads to selecting the non-existent
DRM_AMD_DC_DCN.
It is easy to fix, adjust this one line to the renaming and 'select
DRM_AMD_DC_FP' once both commits are merged. For now, I am just
reporting to let you know; probably, it is best to get a quick fix-up
patch with -rc2, once all the changes landed in -rc1.
Best regards,
Lukas
[PATCH] drm/amdkfd: make SPDX License expression more sound
Commit b5f57384805a ("drm/amdkfd: Add sysfs bitfields and enums to uAPI")
adds include/uapi/linux/kfd_sysfs.h with the "GPL-2.0 OR MIT WITH
Linux-syscall-note" SPDX-License expression.
The command ./scripts/spdxcheck.py warns:
include/uapi/linux/kfd_sysfs.h: 1:48 Exception not valid for license MIT:
Linux-syscall-note
For a uapi header, the file under GPLv2 License must be combined with the
Linux-syscall-note, but combining the MIT License with the
Linux-syscall-note makes no sense, as the note provides an exception for
GPL-licensed code, not for permissively licensed code.
So, reorganize the SPDX expression to only combine the note with the GPL
License condition. This makes spdxcheck happy again.
Signed-off-by: Lukas Bulwahn
---
I am not a lawyer and I do not intend to modify the actual licensing of
this header file. So, I really would like to have an Ack from some AMD
developer here.
Maybe also a lawyer on the linux-spdx list can check my reasoning on the
licensing with the exception note?
include/uapi/linux/kfd_sysfs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/kfd_sysfs.h b/include/uapi/linux/kfd_sysfs.h
index e1fb78b4bf09..3e330f368917 100644
--- a/include/uapi/linux/kfd_sysfs.h
+++ b/include/uapi/linux/kfd_sysfs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT WITH Linux-syscall-note */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
/*
* Copyright 2021 Advanced Micro Devices, Inc.
*
--
2.17.1
[PATCH] drm/amdgpu: rectify line endings in umc v8_7_0 IP headers
Commit 6b36fa6143f6 ("drm/amdgpu: add umc v8_7_0 IP headers") adds the new
file ./drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h with
DOS line endings, which is very uncommon for the kernel repository.
Rectify the line endings in this file with dos2unix.
Identified by a checkpatch evaluation on the whole kernel repository and
spot-checking for really unexpected checkpatch rule violations.
Reported-by: Dwaipayan Ray
Signed-off-by: Lukas Bulwahn
---
.../include/asic_reg/umc/umc_8_7_0_sh_mask.h | 158 +-
1 file changed, 79 insertions(+), 79 deletions(-)
diff --git a/drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h
b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h
index 4c5097fa0c09..d5ef91d3c391 100644
--- a/drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h
+++ b/drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h
@@ -1,79 +1,79 @@
-#ifndef _umc_8_7_0_SH_MASK_HEADER
-#define _umc_8_7_0_SH_MASK_HEADER
-
-//UMCCH0_0_GeccErrCntSel
-#define UMCCH0_0_GeccErrCntSel__GeccErrCntCsSel__SHIFT
0x0
-#define UMCCH0_0_GeccErrCntSel__GeccErrInt__SHIFT
0xc
-#define UMCCH0_0_GeccErrCntSel__GeccErrCntEn__SHIFT
0xf
-#define UMCCH0_0_GeccErrCntSel__PoisonCntEn__SHIFT
0x10
-#define UMCCH0_0_GeccErrCntSel__GeccErrCntCsSel_MASK
0x000FL
-#define UMCCH0_0_GeccErrCntSel__GeccErrInt_MASK
0x3000L
-#define UMCCH0_0_GeccErrCntSel__GeccErrCntEn_MASK
0x8000L
-#define UMCCH0_0_GeccErrCntSel__PoisonCntEn_MASK
0x0003L
-//UMCCH0_0_GeccErrCnt
-#define UMCCH0_0_GeccErrCnt__GeccErrCnt__SHIFT
0x0
-#define UMCCH0_0_GeccErrCnt__GeccUnCorrErrCnt__SHIFT
0x10
-#define UMCCH0_0_GeccErrCnt__GeccErrCnt_MASK
0xL
-#define UMCCH0_0_GeccErrCnt__GeccUnCorrErrCnt_MASK
0xL
-//MCA_UMC_UMC0_MCUMC_STATUST0
-#define MCA_UMC_UMC0_MCUMC_STATUST0__ErrorCode__SHIFT
0x0
-#define MCA_UMC_UMC0_MCUMC_STATUST0__ErrorCodeExt__SHIFT
0x10
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV22__SHIFT
0x16
-#define MCA_UMC_UMC0_MCUMC_STATUST0__AddrLsb__SHIFT
0x18
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV30__SHIFT
0x1e
-#define MCA_UMC_UMC0_MCUMC_STATUST0__ErrCoreId__SHIFT
0x20
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV38__SHIFT
0x26
-#define MCA_UMC_UMC0_MCUMC_STATUST0__Scrub__SHIFT
0x28
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV41__SHIFT
0x29
-#define MCA_UMC_UMC0_MCUMC_STATUST0__Poison__SHIFT
0x2b
-#define MCA_UMC_UMC0_MCUMC_STATUST0__Deferred__SHIFT
0x2c
-#define MCA_UMC_UMC0_MCUMC_STATUST0__UECC__SHIFT
0x2d
-#define MCA_UMC_UMC0_MCUMC_STATUST0__CECC__SHIFT
0x2e
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV47__SHIFT
0x2f
-#define MCA_UMC_UMC0_MCUMC_STATUST0__Transparent__SHIFT
0x34
-#define MCA_UMC_UMC0_MCUMC_STATUST0__SyndV__SHIFT
0x35
-#define MCA_UMC_UMC0_MCUMC_STATUST0__RESERV54__SHIFT
0x36
-#define MCA_UMC_UMC0_MCUMC_STATUST0__TCC__SHIFT
0x37
-#define MCA_UMC_UMC0_MCUMC_STATUST0__ErrCoreIdVal__SHIFT
0x38
-#define MCA_UMC_UMC0_MCUMC_STATUST0__PCC__SHIFT
0x39
-#define MCA_UMC_UMC0_MCUMC_STATUST0__AddrV__SHIFT
0x3
[PATCH -next] drm/amd/display: tweak the kerneldoc for active_vblank_irq_count
Commit 71338cb4a7c2 ("drm/amd/display: enable idle optimizations for linux
(MALL stutter)") adds active_vblank_irq_count to amdgpu_display_manager
in ./drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h.
The kerneldoc is incorrectly formatted, and make htmldocs warns:
./drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h:
340: warning: Incorrect use of kernel-doc format: *
@active_vblank_irq_count
379: warning: Function parameter or member 'active_vblank_irq_count' not
described in 'amdgpu_display_manager'
Tweak the kerneldoc for active_vblank_irq_count.
Signed-off-by: Lukas Bulwahn
---
applies on amdgpu's -next and next-20210111
Bhawanpreet, Nick, please review and ack.
Alex, Christian, please pick on top of the commit above.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index f084e2fc9569..5ee1b766884e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -337,7 +337,7 @@ struct amdgpu_display_manager {
const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;
/**
-* @active_vblank_irq_count
+* @active_vblank_irq_count:
*
* number of currently active vblank irqs
*/
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [RFC] MAINTAINERS tag for cleanup robot
On Mon, Nov 23, 2020 at 4:52 PM Jani Nikula wrote:
>
> On Sat, 21 Nov 2020, James Bottomley
> wrote:
> > On Sat, 2020-11-21 at 08:50 -0800, t...@redhat.com wrote:
> >> A difficult part of automating commits is composing the subsystem
> >> preamble in the commit log. For the ongoing effort of a fixer
> >> producing
> >> one or two fixes a release the use of 'treewide:' does not seem
> >> appropriate.
> >>
> >> It would be better if the normal prefix was used. Unfortunately
> >> normal is
> >> not consistent across the tree.
> >>
> >>
> >> D: Commit subsystem prefix
> >>
> >> ex/ for FPGA DFL DRIVERS
> >>
> >> D: fpga: dfl:
> >>
> >
> > I've got to bet this is going to cause more issues than it solves.
>
> Agreed.
>
Tom, this a problem only kernel janitors encounter; all other
developers really do not have that issue. The time spent on creating
the patch is much larger than the amount saved if the commit log
header line prefix would be derived automatically. I believe Julia
Lawall, Arnd Bergmann and Nathan Chancellor as long-term
high-frequency janitors do have already scripted approaches to that
issue. Maybe they simply need to share these scripts with you and you
consolidate them and share with everyone?
Also, making clean-up patches cumbersome has a positive side as well;
maintainers are not swamped with fully automated patch submissions.
There have been some bad experiences with some submitters on that in
the past...
> > SCSI uses scsi: : for drivers but not every driver has a
> > MAINTAINERS entry. We use either scsi: or scsi: core: for mid layer
> > things, but we're not consistent. Block uses blk-: for all
> > of it's stuff but almost no s have a MAINTAINERS entry. So
> > the next thing you're going to cause is an explosion of suggested
> > MAINTAINERs entries.
>
> On the one hand, adoption of new MAINTAINERS entries has been really
> slow. Look at B, C, or P, for instance. On the other hand, if this were
> to get adopted, you'll potentially get conflicting prefixes for patches
> touching multiple files. Then what?
>
> I'm guessing a script looking at git log could come up with better
> suggestions for prefixes via popularity contest than manually maintained
> MAINTAINERS entries. It might not always get it right, but then human
> outsiders aren't going to always get it right either.
>
> Now you'll only need Someone(tm) to write the script. ;)
>
> Something quick like this:
>
> git log --since={1year} --pretty=format:%s -- |\
> grep -v "^\(Merge\|Revert\)" |\
> sed 's/:[^:]*$//' |\
> sort | uniq -c | sort -rn | head -5
>
> already gives me results that really aren't worse than some of the
> prefixes invented by drive-by contributors.
>
I agree I do not see the need to introduce something in MAINTAINERS;
from my observations maintaining MAINTAINERS, there is sufficient work
on adoption and maintenance of the existing entries already without
such an yet another additional entry. Some entries are outdated or
wrong and the janitor task of cleaning those up is already enough work
for involved janitors and enough churn for involved maintainers. So a
machine-learned approach as above is probably good enough, but if you
think you need more complex rules try to learn them from the data at
hand... certainly a nice task to do with machine learning on commit
message prefixes.
Lukas
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amdgpu: remove unintended executable mode
Besides the intended change, commit 3437f5f6c979 ("drm/amdgpu: add gfx
support for van gogh (v2)") also set the source files gfx_v10_0.c to be
executable, i.e., changed from old mode 644 to new mode 755.
Set to the usual mode for source and headers files. No functional change.
Signed-off-by: Lukas Bulwahn
---
applies cleanly on next-20201002
Alex, please pick this minor non-urgent cleanup patch on your -next tree.
Huang Rui, please ack. You might want to check your development environment
introducing those executable modes on files.
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
old mode 100755
new mode 100644
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amd/display: remove unintended executable mode
Besides the intended change, commit 4cc1178e166a ("drm/amdgpu: replace DRM
prefix with PCI device info for gfx/mmhub") also set the source files
mmhub_v1_0.c and gfx_v9_4.c to be executable, i.e., changed fromold mode
644 to new mode 755.
Commit 241b2ec9317e ("drm/amd/display: Add dcn30 Headers (v2)") added the
four header files {dpcs,dcn}_3_0_0_{offset,sh_mask}.h as executable, i.e.,
mode 755.
Set to the usual modes for source and headers files and clean up those
mistakes. No functional change.
Signed-off-by: Lukas Bulwahn
---
applies cleanly on current master and next-20200819
Alex, Christian, please pick this minor non-urgent cleanup patch.
Dennis, Jerry, please ack.
Dennis, Jerry, you might want to check your development environment
introducing those executable modes on files.
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 0
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 0
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 0
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 0
drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h | 0
drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h | 0
6 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
mode change 100755 => 100644
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
mode change 100755 => 100644
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
mode change 100755 => 100644
drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h
mode change 100755 => 100644
drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
old mode 100755
new mode 100644
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
old mode 100755
new mode 100644
diff --git a/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
b/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
old mode 100755
new mode 100644
diff --git a/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
b/drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
old mode 100755
new mode 100644
diff --git a/drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h
b/drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h
old mode 100755
new mode 100644
diff --git a/drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h
b/drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h
old mode 100755
new mode 100644
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] dma-buf.rst: repair length of title underline
With commit 72b6ede73623 ("dma-buf.rst: Document why indefinite fences are
a bad idea"), document generation warns:
Documentation/driver-api/dma-buf.rst:182: \
WARNING: Title underline too short.
Repair length of title underline to remove warning.
Fixes: 72b6ede73623 ("dma-buf.rst: Document why indefinite fences are a bad
idea")
Signed-off-by: Lukas Bulwahn
---
Daniel, please pick this minor non-urgent fix to your new documentation.
Documentation/driver-api/dma-buf.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/driver-api/dma-buf.rst
b/Documentation/driver-api/dma-buf.rst
index 100bfd227265..13ea0cc0a3fa 100644
--- a/Documentation/driver-api/dma-buf.rst
+++ b/Documentation/driver-api/dma-buf.rst
@@ -179,7 +179,7 @@ DMA Fence uABI/Sync File
:internal:
Indefinite DMA Fences
-
+~
At various times &dma_fence with an indefinite time until dma_fence_wait()
finishes have been proposed. Examples include:
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
