2020-12-24 02:31:22

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm fixes for 5.11-rc1

Hi Linus,

Xmas eve pull request present. Just some fixes that trickled in this
past week. Mostly amdgpu fixes, with a dma-buf/mips build fix and some
misc komeda fixes.

Hope you have a good holiday season,
Dave.

drm-next-2020-12-24:
drm fixes for 5.11-rc1

dma-buf:
- fix build on mips

komeda:
- fix commit tail operation order
- NULL pointer fix
- out of bounds access fix

ttm:
- remove an unused function

amdgpu:
- Vangogh SMU fixes
- Arcturus gfx9 fixes
- Misc display fixes
- Sienna Cichlid SMU update
- Fix S3 display memory leak
- Fix regression caused by DP sub-connector support

amdkfd:
- Properly require pcie atomics for gfx10
The following changes since commit 4efd7faba5e0687ae9143b7e6a19547ede20a7dd:

Merge tag 'drm-intel-next-fixes-2020-12-18' of
git://anongit.freedesktop.org/drm/drm-intel into drm-next (2020-12-18
16:22:10 +0100)

are available in the Git repository at:

git://anongit.freedesktop.org/drm/drm tags/drm-next-2020-12-24

for you to fetch changes up to 5b2fc08c455bbf749489254a81baeffdf4c0a693:

Merge tag 'amd-drm-fixes-5.11-2020-12-23' of
git://people.freedesktop.org/~agd5f/linux into drm-next (2020-12-24
10:31:16 +1000)

----------------------------------------------------------------
drm fixes for 5.11-rc1

dma-buf:
- fix build on mips

komeda:
- fix commit tail operation order
- NULL pointer fix
- out of bounds access fix

ttm:
- remove an unused function

amdgpu:
- Vangogh SMU fixes
- Arcturus gfx9 fixes
- Misc display fixes
- Sienna Cichlid SMU update
- Fix S3 display memory leak
- Fix regression caused by DP sub-connector support

amdkfd:
- Properly require pcie atomics for gfx10

----------------------------------------------------------------
Alex Deucher (3):
drm/amdgpu: fix vbios reservation handling on SR-IOV
drm/amdgpu: only set DP subconnector type on DP and eDP connectors
drm/amdgpu: Fix a copy-pasta comment

Aric Cyr (1):
drm/amd/display: Multi-display underflow observed

Arnd Bergmann (1):
drm/ttm: fix unused function warning

Carsten Haitzler (3):
drm/komeda: Remove useless variable assignment
drm/komeda: Handle NULL pointer access code path in error case
drm/komeda: Fix bit check to import to value of proper type

Christian König (1):
drm/qxl: don't allocate a dma_address array

Dave Airlie (2):
Merge tag 'drm-misc-next-fixes-2020-12-22' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next
Merge tag 'amd-drm-fixes-5.11-2020-12-23' of
git://people.freedesktop.org/~agd5f/linux into drm-next

Eryk Brol (1):
drm/amd/display: Remove unnecessary NULL check

Evan Quan (1):
drm/amd/pm: bump Sienna Cichlid smu_driver_if version to match latest pmfw

Harish Kasiviswanathan (1):
drm/amdkfd: PCIe atomics required for gfx10

Hawking Zhang (3):
drm/amdgpu: check number of gfx ring before init cp gfx
drm/amdgpu: remove unnecessary asic type check
drm/amdgpu: check gfx pipe availability before toggling its interrupts

Jake Wang (2):
drm/amd/display: updated wm table for Renoir
drm/amd/display: always program DPPDTO unless not safe to lower

James Qian Wang (1):
drm/komeda: Correct the sequence of hw_done() and flip_done()

John Stultz (1):
dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS

Josip Pavic (1):
drm/amd/display: add getter routine to retrieve mpcc mux

Martin Tsai (2):
drm/amd/display: Modify the hdcp device count check condition
drm/amd/display: To modify the condition in indicating branch device

Michael Strauss (1):
drm/amd/display: Update RN/VGH active display count workaround

Qingqing Zhuo (1):
drm/amd/display: handler not correctly checked at remove_irq_handler

Rizvi (1):
drm/amd/display: gradually ramp ABM intensity

Stylon Wang (1):
drm/amd/display: Fix memory leaks in S3 resume

Sung Lee (1):
drm/amd/display: Acquire DSC during split stream for ODM only if top_pipe

Wesley Chalmers (1):
drm/amd/display: Interfaces for hubp blank and soft reset

Xiaomeng Hou (1):
drm/amd/pm: check pmfw version before issuing RlcPowerNotify message

Yongqiang Sun (2):
drm/amd/display: change SMU repsonse timeout to 2s.
drm/amd/display: [FW Promotion] Release 0.0.47

drivers/dma-buf/heaps/cma_heap.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 +++---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 21 ++++++++-----
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 +++----
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 ++++----
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +--
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 5 ++-
.../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 36 +++++++++-------------
.../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +-
.../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 9 +-----
drivers/gpu/drm/amd/display/dc/core/dc.c | 20 ------------
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +----
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 18 +++++++++++
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 +++
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 12 ++++++++
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 1 +
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 ++
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 ++++++--
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 1 +
.../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 ++
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1 +
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 ++
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 4 +++
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +--
.../drm/amd/display/modules/hdcp/hdcp1_execution.c | 8 +++--
.../drm/amd/display/modules/hdcp/hdcp2_execution.c | 7 +++--
.../drm/amd/display/modules/power/power_helpers.c | 35 +++++++++++++++------
.../drm/amd/display/modules/power/power_helpers.h | 1 +
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 9 ++++--
drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 1 -
drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 +--
.../gpu/drm/arm/display/komeda/komeda_pipeline.c | 3 +-
.../drm/arm/display/komeda/komeda_pipeline_state.c | 4 +--
drivers/gpu/drm/ttm/ttm_pool.c | 29 +++++++++--------
38 files changed, 182 insertions(+), 132 deletions(-)


2020-12-24 22:02:04

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [git pull] drm fixes for 5.11-rc1

The pull request you sent on Thu, 24 Dec 2020 12:29:16 +1000:

> git://anongit.freedesktop.org/drm/drm tags/drm-next-2020-12-24

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ef2c8b81b88868f042579b9dd021cc9edbc2d0c6

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

2020-12-24 22:29:57

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] drm fixes for 5.11-rc1

On Wed, Dec 23, 2020 at 6:29 PM Dave Airlie <[email protected]> wrote:
>
> Xmas eve pull request present. Just some fixes that trickled in this
> past week. Mostly amdgpu fixes, with a dma-buf/mips build fix and some
> misc komeda fixes.

Well, I already pulled and pushed out my merge, but only noticed
afterwards that clang complains about this, and I think it's a real
bug:

drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_mpc.c:475:6: warning:
variable 'val' is used uninitialized whenever 'if' condition is
false [-Wsometimes-uninitialized]

and it sure is true: the code literally does

uint32_t val;

if (opp_id < MAX_OPP && REG(MUX[opp_id]))
REG_GET(MUX[opp_id], MPC_OUT_MUX, &val);

return val;

so clearly 'val' isn't initialized if that if-statement isn't true.

I assume 'opp_id' is always presumed to be valid, but that code really
is disgusting.

Just make it return 0 (or whatever) for invalid, possibly together
with a WARN_ON_ONCE(). Ok?

Linus

2020-12-29 15:10:59

by Alex Deucher

[permalink] [raw]
Subject: Re: [git pull] drm fixes for 5.11-rc1

On Thu, Dec 24, 2020 at 5:28 PM Linus Torvalds
<[email protected]> wrote:
>
> On Wed, Dec 23, 2020 at 6:29 PM Dave Airlie <[email protected]> wrote:
> >
> > Xmas eve pull request present. Just some fixes that trickled in this
> > past week. Mostly amdgpu fixes, with a dma-buf/mips build fix and some
> > misc komeda fixes.
>
> Well, I already pulled and pushed out my merge, but only noticed
> afterwards that clang complains about this, and I think it's a real
> bug:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_mpc.c:475:6: warning:
> variable 'val' is used uninitialized whenever 'if' condition is
> false [-Wsometimes-uninitialized]
>
> and it sure is true: the code literally does
>
> uint32_t val;
>
> if (opp_id < MAX_OPP && REG(MUX[opp_id]))
> REG_GET(MUX[opp_id], MPC_OUT_MUX, &val);
>
> return val;
>
> so clearly 'val' isn't initialized if that if-statement isn't true.
>
> I assume 'opp_id' is always presumed to be valid, but that code really
> is disgusting.
>
> Just make it return 0 (or whatever) for invalid, possibly together
> with a WARN_ON_ONCE(). Ok?

Harry, Nick, Hersen,

Can you take a look?

Thanks,

Alex

>
> Linus
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

2020-12-29 17:04:01

by Rodrigo Siqueira Jordao

[permalink] [raw]
Subject: Re: [git pull] drm fixes for 5.11-rc1

Hi,

This patch should fix the issue:

https://patchwork.freedesktop.org/patch/410754/?series=85303&rev=1

Thanks

On 12/29, R, Bindu wrote:
> [AMD Official Use Only - Internal Distribution Only]
>
> ++Siqueira.
> Regards,
> Bindu
>
> ══════════════════════════════════════════════════════════════════════════
>
> From: Alex Deucher <[email protected]>
> Sent: Tuesday, December 29, 2020 10:07 AM
> To: Linus Torvalds <[email protected]>; Wentland, Harry
> <[email protected]>; Kazlauskas, Nicholas
> <[email protected]>; Wu, Hersen <[email protected]>
> Cc: Dave Airlie <[email protected]>; Pavic, Josip <[email protected]>;
> R, Bindu <[email protected]>; Deucher, Alexander
> <[email protected]>; Daniel Vetter <[email protected]>; LKML
> <[email protected]>; dri-devel
> <[email protected]>
> Subject: Re: [git pull] drm fixes for 5.11-rc1
>  
> On Thu, Dec 24, 2020 at 5:28 PM Linus Torvalds
> <[email protected]> wrote:
> >
> > On Wed, Dec 23, 2020 at 6:29 PM Dave Airlie <[email protected]> wrote:
> > >
> > > Xmas eve pull request present. Just some fixes that trickled in this
> > > past week. Mostly amdgpu fixes, with a dma-buf/mips build fix and some
> > > misc komeda fixes.
> >
> > Well, I already pulled and pushed out my merge, but only noticed
> > afterwards that clang complains about this, and I think it's a real
> > bug:
> >
> >   drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_mpc.c:475:6:
> warning:
> >      variable 'val' is used uninitialized whenever 'if' condition is
> > false [-Wsometimes-uninitialized]
> >
> > and it sure is true: the code literally does
> >
> >         uint32_t val;
> >
> >         if (opp_id < MAX_OPP && REG(MUX[opp_id]))
> >                 REG_GET(MUX[opp_id], MPC_OUT_MUX, &val);
> >
> >         return val;
> >
> > so clearly 'val' isn't initialized if that if-statement isn't true.
> >
> > I assume 'opp_id' is always presumed to be valid, but that code really
> > is disgusting.
> >
> > Just make it return 0 (or whatever) for invalid, possibly together
> > with a WARN_ON_ONCE(). Ok?
>
> Harry, Nick, Hersen,
>
> Can you take a look?
>
> Thanks,
>
> Alex
>
> >
> >              Linus
> > _______________________________________________
> > dri-devel mailing list
> > [email protected]
> >
> [1]https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fdri-devel&amp;data=04%7C01%7Cbindu.r%40amd.com%7Cae8f547c9287426b9b9408d8ac0b7b73%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637448512618562550%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=4gcQRS3HI4u1UEWu35Ze1w5CLWmAof5nouCFQoKEQD0%3D&amp;reserved=0
>
> References
>
> Visible links
> 1. https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fdri-devel&amp;data=04%7C01%7Cbindu.r%40amd.com%7Cae8f547c9287426b9b9408d8ac0b7b73%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637448512618562550%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=4gcQRS3HI4u1UEWu35Ze1w5CLWmAof5nouCFQoKEQD0%3D&amp;reserved=0

--
Rodrigo Siqueira
https://siqueira.tech


Attachments:
(No filename) (3.70 kB)
signature.asc (849.00 B)
Download all attachments