Re: [PATCH v2] drm/amd/display: fix documentation warnings for mpc.h
Hi Marcelo,
On Sat, 11 May 2024 13:37:17 +1000 Stephen Rothwell
wrote:
>
> Thanks for doing this.
>
> I haven't tested it, but just a couple of little things:
>
> On Fri, 10 May 2024 21:02:02 -0300 Marcelo Mendes Spessoto Junior
> wrote:
> >
> > Fix most of the display documentation compile warnings by
> > documenting struct mpc_funcs functions in dc/inc/hw/mpc.h file.
> >
> .
> .
> .
> >
> > Fixes:
> > b8c1c3a82e75 ("Documentation/gpu: Add kernel doc entry for MPC")
>
> Please don't split the Fixes tag line and also don't add blank lines
> between tags.
>
> I also appreciate being credited for reporting (unless you got a report
> from somewhere else as well, then maybe credit both).
>
> Reported-by: Stephen Rothwell
Now tested.
Tested-by: Stephen Rothwell
Closes:
https://lore.kernel.org/linux-next/20240130134954.04fcf...@canb.auug.org.au/
--
Cheers,
Stephen Rothwell
pgpn3TqFBg4mT.pgp
Description: OpenPGP digital signature
Re: [PATCH v2] drm/amd/display: fix documentation warnings for mpc.h
Hi Marcelo,
Thanks for doing this.
I haven't tested it, but just a couple of little things:
On Fri, 10 May 2024 21:02:02 -0300 Marcelo Mendes Spessoto Junior
wrote:
>
> Fix most of the display documentation compile warnings by
> documenting struct mpc_funcs functions in dc/inc/hw/mpc.h file.
>
.
.
.
>
> Fixes:
> b8c1c3a82e75 ("Documentation/gpu: Add kernel doc entry for MPC")
Please don't split the Fixes tag line and also don't add blank lines
between tags.
I also appreciate being credited for reporting (unless you got a report
from somewhere else as well, then maybe credit both).
Reported-by: Stephen Rothwell
>
> Signed-off-by: Marcelo Mendes Spessoto Junior
> ---
--
Cheers,
Stephen Rothwell
pgpleiX0ogMI_.pgp
Description: OpenPGP digital signature
Re: [PATCH] drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps()
Hi Alex,
On Tue, 30 Aug 2022 17:57:52 -0400 Alex Deucher
wrote:
>
> Document missing parameter.
>
> Fixes: 8889a13f99e5 ("drm/amd/display: Add some extra kernel doc to
> amdgpu_dm")
> Reported-by: Stephen Rothwell
> Signed-off-by: Alex Deucher
> Cc: Rodrigo Siqueira
> Cc: Harry Wentland
> ---
>
> v2: fix aconnector too.
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks, looks good.
--
Cheers,
Stephen Rothwell
pgpKjaEYrotQZ.pgp
Description: OpenPGP digital signature
Re: [PATCH 2/2] drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps()
Hi Alex,
On Tue, 30 Aug 2022 09:32:17 -0400 Alex Deucher
wrote:
>
> Document missing parameter.
>
> Fixes: 8889a13f99e5 ("drm/amd/display: Add some extra kernel doc to
> amdgpu_dm")
> Reported-by: Stephen Rothwell
> Signed-off-by: Alex Deucher
> Cc: Rodrigo Siqueira
> Cc: Harry Wentland
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 15d51d300b34..4e24b75efcfe 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -9938,6 +9938,7 @@ static int parse_hdmi_amd_vsdb(struct
> amdgpu_dm_connector *aconnector,
> * amdgpu_dm_update_freesync_caps - Update Freesync capabilities
> *
> * @aconnector: Connector to query.
> + * @edid: EDID from monitor
> *
> * Amdgpu supports Freesync in DP and HDMI displays, and it is required to
> keep
> * track of some of the display information in the internal data struct used
> by
> --
> 2.37.1
>
That is not the problem I reported (though that also needed fixing)
I reported:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:9951: warning: Excess
function parameter 'aconnector' description in 'amdgpu_dm_update_freesync_caps'
The parameter is actually "connector" (no 'a'), so the line above the
one you added needs fixing as well.
--
Cheers,
Stephen Rothwell
pgp_TptO1XEDn.pgp
Description: OpenPGP digital signature
Re: build failure of next-20220811 due to b1a63a0b48ad ("drm/amd/display: consider DSC pass-through during mode validation")
Hi Sudip,
On Wed, 17 Aug 2022 21:39:17 +0100 Sudip Mukherjee
wrote:
>
> On Wed, Aug 17, 2022 at 12:43 AM Stephen Rothwell
> wrote:
> >
> > On Fri, 12 Aug 2022 09:07:31 +1000 Stephen Rothwell
> > wrote:
> > >
> > > On Thu, 11 Aug 2022 18:10:48 +0100 "Sudip Mukherjee (Codethink)"
> > > wrote:
> > > >
> > > > Not sure if it has been reported, builds of riscv, alpha, s390, arm,
> > > > arm64, xtensa, mips, csky allmodconfig have failed to build
> > > > next-20220811
> > > > with the error:
> > > >
> > > > ERROR: modpost: "dc_dsc_compute_bandwidth_range"
> > > > [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> > > > ERROR: modpost: "dc_dsc_get_policy_for_timing"
> > > > [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> > > >
> > > > git bisect pointed to b1a63a0b48ad ("drm/amd/display: consider DSC
> > > > pass-through during mode validation")
> > > > And, reverting that commit has fixed the build failure.
> > > >
> > > > I will be happy to test any patch or provide any extra log if needed.
> > >
> > > I have reverted that commit in today's linux-next.
> >
> > I have removed that revert. Sudip, can you recheck when linux-next is
> > released, please?
>
> The build failure is not seen with next-20220817.
Excellent, thanks.
--
Cheers,
Stephen Rothwell
pgpFiWk6JIXYG.pgp
Description: OpenPGP digital signature
Re: build failure of next-20220811 due to b1a63a0b48ad ("drm/amd/display: consider DSC pass-through during mode validation")
Hi all,
On Fri, 12 Aug 2022 09:07:31 +1000 Stephen Rothwell wrote:
>
> On Thu, 11 Aug 2022 18:10:48 +0100 "Sudip Mukherjee (Codethink)"
> wrote:
> >
> > Not sure if it has been reported, builds of riscv, alpha, s390, arm,
> > arm64, xtensa, mips, csky allmodconfig have failed to build next-20220811
> > with the error:
> >
> > ERROR: modpost: "dc_dsc_compute_bandwidth_range"
> > [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> > ERROR: modpost: "dc_dsc_get_policy_for_timing"
> > [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> >
> > git bisect pointed to b1a63a0b48ad ("drm/amd/display: consider DSC
> > pass-through during mode validation")
> > And, reverting that commit has fixed the build failure.
> >
> > I will be happy to test any patch or provide any extra log if needed.
>
> I have reverted that commit in today's linux-next.
I have removed that revert. Sudip, can you recheck when linux-next is
released, please?
--
Cheers,
Stephen Rothwell
pgph6Q7cvMmL3.pgp
Description: OpenPGP digital signature
Re: build failure of next-20220811 due to b1a63a0b48ad ("drm/amd/display: consider DSC pass-through during mode validation")
Hi all,
On Thu, 11 Aug 2022 18:10:48 +0100 "Sudip Mukherjee (Codethink)"
wrote:
>
> Not sure if it has been reported, builds of riscv, alpha, s390, arm,
> arm64, xtensa, mips, csky allmodconfig have failed to build next-20220811
> with the error:
>
> ERROR: modpost: "dc_dsc_compute_bandwidth_range"
> [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> ERROR: modpost: "dc_dsc_get_policy_for_timing"
> [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>
> git bisect pointed to b1a63a0b48ad ("drm/amd/display: consider DSC
> pass-through during mode validation")
> And, reverting that commit has fixed the build failure.
>
> I will be happy to test any patch or provide any extra log if needed.
I have reverted that commit in today's linux-next.
--
Cheers,
Stephen Rothwell
pgpnn2ris7VwS.pgp
Description: OpenPGP digital signature
Re: [PATCH] drm/amd/display: Reduce stack size in the mode support function
Hi all, On Mon, 25 Jul 2022 07:41:09 +1000 Stephen Rothwell wrote: > > On Fri, 22 Jul 2022 14:12:44 -0400 Alex Deucher wrote: > > > > On Fri, Jul 22, 2022 at 1:56 PM Rodrigo Siqueira > > wrote: > > > > > > When we use the allmodconfig option we see the following error: > > > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: > > > In function 'dml32_ModeSupportAndSystemConfigurationFull': > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: > > > error: the frame size of 2464 bytes is larger than 2048 bytes > > > [-Werror=frame-larger-than=] > > > 3799 | } // ModeSupportAndSystemConfigurationFull > > > > > > This commit fixes this issue by moving part of the mode support > > > operation from ModeSupportAndSystemConfigurationFull to a dedicated > > > function. > > > > > > Cc: Harry Wentland > > > Cc: Alex Deucher > > > Cc: Aurabindo Pillai > > > Cc: Stephen Rothwell > > > Signed-off-by: Rodrigo Siqueira > > > > Thanks for sorting this out! > > Acked-by: Alex Deucher > > Tested-by: Stephen Rothwell > > Also, after applying the above patch, the following commits are no > longer needed: > > 987949933127 drm/amd/display: reduce stack for dml32_CalculatePrefetchSchedule > 8f08cd32b767 drm/amd/display: reduce stack for > dml32_CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport > 5d526d124fe3 drm/amd/display: reduce stack for dml32_CalculateVMRowAndSwath > f6ceebcc7825 drm/amd/display: reduce stack for > dml32_CalculateSwathAndDETConfiguration > > and could be reverted (or removed). Actually, they are now: 2623c2c90981 drm/amd/display: reduce stack for dml32_CalculatePrefetchSchedule 7d5c4fd7c543 drm/amd/display: reduce stack for dml32_CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport 65f946cee7be drm/amd/display: reduce stack for dml32_CalculateVMRowAndSwath d35fa7f64f4f drm/amd/display: reduce stack for dml32_CalculateSwathAndDETConfiguration -- Cheers, Stephen Rothwell pgpzE8S2GUvdD.pgp Description: OpenPGP digital signature
Re: [PATCH] drm/amd/display: Reduce stack size in the mode support function
Hi all, On Fri, 22 Jul 2022 14:12:44 -0400 Alex Deucher wrote: > > On Fri, Jul 22, 2022 at 1:56 PM Rodrigo Siqueira > wrote: > > > > When we use the allmodconfig option we see the following error: > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: > > In function 'dml32_ModeSupportAndSystemConfigurationFull': > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: > > error: the frame size of 2464 bytes is larger than 2048 bytes > > [-Werror=frame-larger-than=] > > 3799 | } // ModeSupportAndSystemConfigurationFull > > > > This commit fixes this issue by moving part of the mode support > > operation from ModeSupportAndSystemConfigurationFull to a dedicated > > function. > > > > Cc: Harry Wentland > > Cc: Alex Deucher > > Cc: Aurabindo Pillai > > Cc: Stephen Rothwell > > Signed-off-by: Rodrigo Siqueira > > Thanks for sorting this out! > Acked-by: Alex Deucher Tested-by: Stephen Rothwell Also, after applying the above patch, the following commits are no longer needed: 987949933127 drm/amd/display: reduce stack for dml32_CalculatePrefetchSchedule 8f08cd32b767 drm/amd/display: reduce stack for dml32_CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport 5d526d124fe3 drm/amd/display: reduce stack for dml32_CalculateVMRowAndSwath f6ceebcc7825 drm/amd/display: reduce stack for dml32_CalculateSwathAndDETConfiguration and could be reverted (or removed). -- Cheers, Stephen Rothwell pgpnwjV_qC1mj.pgp Description: OpenPGP digital signature
Re: linux-next: Tree for Jun 15 (drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c)
Hi all,
On Wed, 15 Jun 2022 13:52:34 -0700 Nathan Chancellor wrote:
>
> On Wed, Jun 15, 2022 at 04:45:16PM -0400, Alex Deucher wrote:
> > On Wed, Jun 15, 2022 at 4:24 PM Nathan Chancellor
> > wrote:
> > >
> > > On Wed, Jun 15, 2022 at 03:28:52PM -0400, Alex Deucher wrote:
> > > > On Wed, Jun 15, 2022 at 3:01 PM Randy Dunlap
> > > > wrote:
> > > > >
> > > > >
> > > > >
> > > > > On 6/14/22 23:01, Stephen Rothwell wrote:
> > > > > > Hi all,
> > > > > >
> > > > > > Changes since 20220614:
> > > > > >
> > > > >
> > > > > on i386:
> > > > > # CONFIG_DEBUG_FS is not set
> > > > >
> > > > >
> > > > > ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In
> > > > > function ‘amdgpu_dm_crtc_late_register’:
> > > > > ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6599:2:
> > > > > error: implicit declaration of function ‘crtc_debugfs_init’; did you
> > > > > mean ‘amdgpu_debugfs_init’? [-Werror=implicit-function-declaration]
> > > > > crtc_debugfs_init(crtc);
> > > > > ^
> > > > > amdgpu_debugfs_init
> > > > >
> > > > >
> > > > > Full randconfig file is attached.
> > > >
> > > > I tried building with your config and I can't repro this. As Harry
> > > > noted, that function and the whole secure display feature depend on
> > > > debugfs. It should never be built without CONFIG_DEBUG_FS. See
> > > > drivers/gpu/drm/amd/display/Kconfig:
> > > >
> > > > > config DRM_AMD_SECURE_DISPLAY
> > > > > bool "Enable secure display support"
> > > > > default n
> > > > > depends on DEBUG_FS
> > > > > depends on DRM_AMD_DC_DCN
> > > > > help
> > > > > Choose this option if you want to
> > > > > support secure display
> > > > >
> > > > > This option enables the calculation
> > > > > of crc of specific region via debugfs.
> > > > > Cooperate with specific DMCU FW.
> > > >
> > > > amdgpu_dm_crtc_late_register is guarded by
> > > > CONIG_DRM_AMD_SECURE_DISPLAY. It's not clear to me how we could hit
> > > > this.
> > >
> > > I think the problem is that you are not looking at the right tree.
> > >
> > > The kernel test robot reported [1] [2] this error is caused by commit
> > > 4cd79f614b50 ("drm/amd/display: Move connector debugfs to drm"), which
> > > is in the drm-misc tree on the drm-misc-next branch. That change removes
> > > the #ifdef around amdgpu_dm_crtc_late_register(), meaning that
> > > crtc_debugfs_init() can be called without CONFIG_DRM_AMD_SECURE_DISPLAY
> > > and CONFIG_DEBUG_FS.
> > >
> > > $ git show -s --format='%h ("%s")'
> > > abf0ba5a34ea ("drm/bridge: it6505: Add missing CRYPTO_HASH dependency")
> > >
> > > $ make -skj"$(nproc)" ARCH=x86_64 mrproper defconfig
> > >
> > > $ scripts/config -d BLK_DEV_IO_TRACE -d DEBUG_FS -e DRM_AMDGPU
> > >
> > > $ make -skj"$(nproc)" ARCH=x86_64 olddefconfig
> > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o
> > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In
> > > function ‘amdgpu_dm_crtc_late_register’:
> > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:6622:9:
> > > error: implicit declaration of function ‘crtc_debugfs_init’; did you mean
> > > ‘amdgpu_debugfs_init’? [-Werror=implicit-function-declaration]
> > >6622 | crtc_debugfs_init(crtc);
> > > | ^
> > > | amdgpu_debugfs_init
> > > cc1: all warnings being treated as errors
> > >
> > > Contrast that with the current top of your tree:
> > >
> > > $ git show -s --format='%h ("%s")'
> > > c435f61d0eb3 ("drm/amd/display: Drop unnecessary guard from DC
> > > resource")
> > >
> > > $ make -skj"$(nproc)" ARCH=x86_64 mrproper defconfig
> > >
>
Re: [Intel-gfx] [PATCH v3 03/13] drm/dp: add LTTPR DP 2.0 DPCD addresses
Hi Nathan,
On Tue, 21 Sep 2021 15:58:23 -0700 Nathan Chancellor wrote:
>
> On Thu, Sep 09, 2021 at 03:51:55PM +0300, Jani Nikula wrote:
> > DP 2.0 brings some new DPCD addresses for PHY repeaters.
> >
> > Cc: dri-de...@lists.freedesktop.org
> > Reviewed-by: Manasi Navare
> > Signed-off-by: Jani Nikula
> > ---
> > include/drm/drm_dp_helper.h | 4
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
> > index 1d5b3dbb6e56..f3a61341011d 100644
> > --- a/include/drm/drm_dp_helper.h
> > +++ b/include/drm/drm_dp_helper.h
> > @@ -1319,6 +1319,10 @@ struct drm_panel;
> > #define DP_MAX_LANE_COUNT_PHY_REPEATER 0xf0004 /*
> > 1.4a */
> > #define DP_Repeater_FEC_CAPABILITY 0xf0004 /* 1.4 */
> > #define DP_PHY_REPEATER_EXTENDED_WAIT_TIMEOUT 0xf0005 /*
> > 1.4a */
> > +#define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER 0xf0006 /* 2.0 */
> > +# define DP_PHY_REPEATER_128B132B_SUPPORTED(1 << 0)
> > +/* See DP_128B132B_SUPPORTED_LINK_RATES for values */
> > +#define DP_PHY_REPEATER_128B132B_RATES 0xf0007 /*
> > 2.0 */
> >
> > enum drm_dp_phy {
> > DP_PHY_DPRX,
> > --
> > 2.30.2
> >
> >
>
> This patch causes a build failure in -next when combined with the AMD
> tree:
>
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c:33:
> In file included from ./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgpu.h:70:
> In file included from ./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgpu_mode.h:36:
> ./include/drm/drm_dp_helper.h:1322:9: error:
> 'DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER' macro redefined
> [-Werror,-Wmacro-redefined]
> #define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER0xf0006 /* 2.0 */
> ^
> ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dp_types.h:881:9: note:
> previous definition is here
> #define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER0xF0006
> ^
> 1 error generated.
>
> Perhaps something like this should be applied during the merge of the
> second tree or maybe this patch should be in a branch that could be
> shared between the Intel and AMD trees so that this diff could be
> applied to the AMD tree directly? Not sure what the standard procedure
> for this is.
>
> Cheers,
> Nathan
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> index 234dfbea926a..279863b5c650 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> @@ -4590,7 +4590,7 @@ bool dp_retrieve_lttpr_cap(struct dc_link *link)
>
> DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV];
>
> link->dpcd_caps.lttpr_caps.supported_128b_132b_rates.raw =
> - lttpr_dpcd_data[DP_PHY_REPEATER_128b_132b_RATES
> -
> + lttpr_dpcd_data[DP_PHY_REPEATER_128B132B_RATES -
>
> DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV];
> #endif
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> index a5e798b5da79..8caf9af5ffa2 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h
> @@ -878,8 +878,6 @@ struct psr_caps {
> # define DP_DSC_DECODER_COUNT_MASK (0b111 << 5)
> # define DP_DSC_DECODER_COUNT_SHIFT 5
> #define DP_MAIN_LINK_CHANNEL_CODING_SET 0x108
> -#define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER 0xF0006
> -#define DP_PHY_REPEATER_128b_132b_RATES 0xF0007
> #define DP_128b_132b_TRAINING_AUX_RD_INTERVAL_PHY_REPEATER1 0xF0022
> #define DP_INTRA_HOP_AUX_REPLY_INDICATION(1 << 3)
> /* TODO - Use DRM header to replace above once available */
Thanks for the heads up. I have applied the above as a merge fix patch
until something else happens.
--
Cheers,
Stephen Rothwell
pgpr0mTyi7Jui.pgp
Description: OpenPGP digital signature
Re: [PATCH] drm/amd/display: [FIX] Compilation error
Hi Qingqing, On Fri, 2 Oct 2020 19:56:08 -0400 Qingqing Zhuo wrote: > > [Why] > ifdef mismatch. > > [How] > Update to the correct flag. > > Signed-off-by: Qingqing Zhuo > Cc: This needs a Fixes: tag (if possible) and the error message, please. -- Cheers, Stephen Rothwell pgpe3VtcahQGq.pgp Description: OpenPGP digital signature ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amdgpu: fix spelling mistake "Falied" -> "Failed"
Hi all,
On Wed, 05 Aug 2020 15:19:38 -0700 Joe Perches wrote:
>
> On Wed, 2020-08-05 at 17:27 -0400, Alex Deucher wrote:
> > On Wed, Aug 5, 2020 at 4:53 PM Joe Perches wrote:
> > > On Wed, 2020-08-05 at 16:01 -0400, Alex Deucher wrote:
> > > > On Wed, Aug 5, 2020 at 7:35 AM Colin King
> > > > wrote:
> > > > > From: Colin Ian King
> > > > >
> > > > > There is a spelling mistake in a DRM_ERROR message. Fix it.
> > > > >
> > > > > Signed-off-by: Colin Ian King
> > > >
> > > > This is already fixed.
> > >
> > > This fix is not in today's -next.
> > >
> > > Perhaps whatever tree it's fixed in should be in -next.
> > >
> >
> > Weird. It's in the drm-next tree as:
> >
> > commit 4afaa61db9cf5250b5734c2531b226e7b3a3d691
> > Author: Colin Ian King
> > Date: Fri Jul 10 09:37:58 2020 +0100
> >
> > drm/amdgpu: fix spelling mistake "Falied" -> "Failed"
> >
> > There is a spelling mistake in a DRM_ERROR error message. Fix it.
> >
> > Signed-off-by: Colin Ian King
> > Signed-off-by: Alex Deucher
> >
> > Alex
> >
> > > $ git show --oneline -s
> > > d15fe4ec0435 (HEAD, tag: next-20200805, origin/master, origin/HEAD) Add
> > > linux-next specific files for 20200805
> > >
> > > $ git grep -i falied drivers
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c:DRM_ERROR("Falied
> > > to terminate tmr\n");
> > >
> > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > []
> > > > > @@ -2010,7 +2010,7 @@ static int psp_suspend(void *handle)
> > > > >
> > > > > ret = psp_tmr_terminate(psp);
> > > > > if (ret) {
> > > > > - DRM_ERROR("Falied to terminate tmr\n");
> > > > > + DRM_ERROR("Failed to terminate tmr\n");
> > > > > return ret;
> > > > > }
>
> Dunno.
>
> Maybe it's due to some ordering of trees in
> how -next accumulates patches?
The spelling error is introduced in two commits:
c564b8601ae9 ("drm/amdgpu: add TMR destory function for psp")
in Linus' tree between v5.8-rc4 and rc5
90937420c44f ("drm/amdgpu: add TMR destory function for psp")
in the amdgpu tree between two merges by the drm tree. In this same
interval, the error is corrected by commit
4afaa61db9cf ("drm/amdgpu: fix spelling mistake "Falied" -> "Failed"")
so when David comes to merge the amdgpu tree in commit
206739119508 ("Merge tag 'amd-drm-next-5.9-2020-07-17' of
git://people.freedesktop.org/~agd5f/linux into drm-next")
the spelling error has been introduced on one side of the merge and
introduced and corrected on the other. This would have produced a
conflict which David presumably resolved in haste by picking the HEAD
side of the merge instead of the MERGE_HEAD side (it happens).
This could have been avoided by not cherry-picking fix commits around
in the amdgpu process - instead having a fixes branch that is merged
into the next branch after the fixes branch has been accepted upstream
(that way there is only one commit for each fix and less conflicts).
I have to deal with these sort of conflicts (sometimes daily) due to
the drm processes. Its a pain as I have to track down each conflict to
see if the same patches appear on both sides of merges and then try to
figure out what other changes occur. (This is only slightly helped by
have the "cherry-picked from" tags in the fix commits.)
--
Cheers,
Stephen Rothwell
pgphtd3IyHin5.pgp
Description: OpenPGP digital signature
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: linux-next: Tree for Aug 19 (amdgpu)
Hi all,
On Mon, 19 Aug 2019 18:34:41 -0700 Randy Dunlap wrote:
>
> On 8/19/19 2:18 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20190816:
> >
>
> on x86_64:
>
> ../drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c: In function ‘amdgpu_exit’:
> ../drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:1471:2: error: implicit
> declaration of function ‘mmu_notifier_synchronize’; did you mean
> ‘__sync_synchronize’? [-Werror=implicit-function-declaration]
> mmu_notifier_synchronize();
> ^~~~
> __sync_synchronize
>
>
> Full randconfig file is attached.
Caused by commit
6832c9dc8358 ("hmm: use mmu_notifier_get/put for 'struct hmm'")
from the hmm tree.
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c need to include linux/mmu_notifier.h
--
Cheers,
Stephen Rothwell
pgpXlVOoZhM7h.pgp
Description: OpenPGP digital signature
