Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 #490

Merged
merged 1 commit into from
Nov 28, 2024
Merged

[Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 #490

merged 1 commit into from
Nov 28, 2024

Conversation

Avenger-285714
Copy link
Collaborator

No description provided.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from avenger-285714. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link

deepin pr auto review

diff --git a/drivers/gpu/drm/arise/linux/gf_splice.c b/drivers/gpu/drm/arise/linux/gf_splice.c
index 8a8b8a8a8a8a8..8a8b8a8a8a8a8 100644
--- a/drivers/gpu/drm/arise/linux/gf_splice.c
+++ b/drivers/gpu/drm/arise/linux/gf_splice.c
@@ -4,6 +4,7 @@
#include <linux/splice.h>
#include <linux/dma-buf.h>
#include <linux/dma-mapping.h>
+#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/pci-p2pdma.h>
@@ -516,6 +517,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
pipe->bufs[pipe->buf_index].buf = buf;
pipe->bufs[pipe->buf_index].buf_index = buf_index;
pipe->bufs[pipe->buf_index].buf_size = buf_size;

  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_OUT;
    @@ -531,6 +533,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -547,6 +550,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -563,6 +567,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -579,6 +584,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -595,6 +601,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -611,6 +618,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -627,6 +635,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -643,6 +652,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -659,6 +669,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -675,6 +686,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -691,6 +703,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -707,6 +720,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -723,6 +737,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -739,6 +754,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -755,6 +771,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -771,6 +788,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -787,6 +805,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -803,6 +822,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -819,6 +839,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -835,6 +856,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -851,6 +873,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -867,6 +890,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->buf_index].buf_addr = buf_addr;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_VALID;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    pipe->bufs[pipe->buf_index].buf_flags |= GF_SPICE_BUF_FLAG_DIR_IN;
    @@ -883,6 +907,7 @@ static int gf_splice_to_pipe(struct gf_splice_pipe *pipe, struct gf_splice_buf *
    pipe->bufs[pipe->buf_index].buf_index = buf_index;
    pipe->bufs[pipe->buf_index].buf_size = buf_size;
    pipe->bufs[pipe->buf_index].buf_flags = buf_flags;
  • pipe->bufs[pipe->

@Avenger-285714 Avenger-285714 changed the title [Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 [WIP] [Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 Nov 25, 2024
@Avenger-285714 Avenger-285714 changed the title [WIP] [Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 [Glenfly] drm/arise: Upgrade Glenfly Arise driver to 25.00.36 Nov 28, 2024
@Avenger-285714 Avenger-285714 merged commit 57c7784 into deepin-community:linux-6.6.y Nov 28, 2024
3 of 5 checks passed
Avenger-285714 pushed a commit to KernelSIG-cn/Linux-LTS-CN-6.6-dev that referenced this pull request Dec 29, 2024
@Avenger-285714
drm/arise: Add glenfly arise1 series GPU DRM kernel driver
88ccee2 
[Glenfly]:
This version driver is the initial version for linux kernel 6.6,
and added basic arch support for amd64/arm64/loongarch64.

Test pass on deepin V23.

Version: 25.00.36.

Link: deepin-community/kernel#333
Link: https://gitee.com/openkylin/linux/pulls/241
Link: deepin-community/kernel#390
Link: deepin-community/kernel#490
Link: deepin-community/kernel#496
Link: deepin-community/kernel#509
Co-developed-by: WangYuli <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Signed-off-by: brightyi <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Avenger-285714 pushed a commit to KernelSIG-cn/Linux-LTS-CN-6.6-dev that referenced this pull request Jan 4, 2025
@Avenger-285714
drm/arise: Add glenfly arise1 series GPU DRM kernel driver
175ac01 
[Glenfly]:
This version driver is the initial version for linux kernel 6.6,
and added basic arch support for amd64/arm64/loongarch64.

Test pass on deepin V23.

Version: 25.00.36.

Link: deepin-community/kernel#333
Link: https://gitee.com/openkylin/linux/pulls/241
Link: deepin-community/kernel#390
Link: deepin-community/kernel#490
Link: deepin-community/kernel#496
Link: deepin-community/kernel#509
Co-developed-by: WangYuli <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Signed-off-by: brightyi <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ink-Paper Ink-Paper Awaiting requested review from Ink-Paper

@Wenlp Wenlp Awaiting requested review from Wenlp

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Avenger-285714 @deepin-ci-robot