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

Fix driver compilation for 5.11 kernel #5867

Merged
merged 2 commits into from
Sep 29, 2021
Merged

Fix driver compilation for 5.11 kernel #5867

merged 2 commits into from
Sep 29, 2021

Conversation

rbramand-xilinx
Copy link
Collaborator

Made changes to fix compilation issues of driver with 5.11 kernel version.
In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
Features missing : p2p support changes are missing.

@rbramand-xilinx
Fix driver compilation for 5.11 kernel
7b871a1 
> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.
@gbuildx
Copy link
Collaborator

gbuildx commented Sep 28, 2021

Build Passed!

chvamshi-xilinx
chvamshi-xilinx reviewed Sep 28, 2021
View reviewed changes
Copy link
Collaborator

@chvamshi-xilinx chvamshi-xilinx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good. Couple of comments.

src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
@@ -537,6 +542,14 @@ static struct drm_driver mm_drm_driver = {
.date = driver_date,
};

const struct drm_gem_object_funcs xocl_gem_object_funcs = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add 5.11 check here as well. I am not sure whether this gets compiled other Kernels or not.

src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
.vmap = xocl_gem_prime_vmap,
.vunmap = xocl_gem_prime_vunmap,
.vm_ops = &xocl_vm_ops,
};
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please maintain same order as < 5.11 sothat it is easy to compare.

src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c Outdated
.get_sg_table = xocl_gem_prime_get_sg_table,
.vmap = xocl_gem_prime_vmap,
.vunmap = xocl_gem_prime_vunmap,
.vm_ops = &xocl_vm_ops,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gem_prime_export is missing from this ops. Please check.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chvamshi-xilinx made changes as suggested. Thanks

chvamshi-xilinx
chvamshi-xilinx approved these changes Sep 29, 2021
View reviewed changes
Copy link
Collaborator

@chvamshi-xilinx chvamshi-xilinx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks

@gbuildx
Copy link
Collaborator

gbuildx commented Sep 29, 2021

Build Passed!

@maxzhen maxzhen merged commit 966b459 into Xilinx:master Sep 29, 2021
rbramand-xilinx added a commit to rbramand-xilinx/XRT that referenced this pull request Sep 30, 2021
@rbramand-xilinx
Fix driver compilation for 5.11 kernel (Xilinx#5867)
4fc4438 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
rbramand-xilinx added a commit to rbramand-xilinx/XRT that referenced this pull request Sep 30, 2021
@rbramand-xilinx
Fix driver compilation for 5.11 kernel (Xilinx#5867)
78a3407 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
maxzhen pushed a commit that referenced this pull request Sep 30, 2021
@rbramand-xilinx
Fix driver compilation for 5.11 kernel (#5867) (#5874)
a567f34 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
maxzhen pushed a commit that referenced this pull request Sep 30, 2021
@rbramand-xilinx
Fix driver compilation for 5.11 kernel (#5867) (#5875)
3550085 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
@keryell
Copy link
Member

keryell commented Sep 30, 2021

I need to bring some Champagne! :-) But I think it is unsuitable at work...

@keryell keryell mentioned this pull request Sep 30, 2021
Closed
jeffli-xilinx pushed a commit to jeffli-xilinx/XRT that referenced this pull request Sep 30, 2021
@rbramand-xilinx
Fix driver compilation for 5.11 kernel (Xilinx#5867)
a1816b9 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
@j-stephan j-stephan mentioned this pull request Dec 1, 2021
Closed
kenter pushed a commit to pc2/XRT that referenced this pull request Apr 12, 2022
@rbramand-xilinx @kenter
Fix driver compilation for 5.11 kernel (Xilinx#5867)
887bdbf 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR
michaellass pushed a commit to pc2/XRT that referenced this pull request Oct 19, 2023
@rbramand-xilinx @michaellass
Fix driver compilation for 5.11 kernel (Xilinx#5867)
7966f3b 
* Fix driver compilation for 5.11 kernel

> Made changes to fix compilation issues of driver with 5.11 kernel version.
> In 5.11 kernel drm_driver structure is changed, added changes in drm framework accordingly.
> Features missing : p2p support changes are missing.

* Fix comments on PR

(cherry picked from commit 966b459)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chvamshi-xilinx chvamshi-xilinx chvamshi-xilinx approved these changes

@maxzhen maxzhen maxzhen approved these changes

@houlz0507 houlz0507 houlz0507 approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@rbramand-xilinx @gbuildx @keryell @houlz0507 @maxzhen @chvamshi-xilinx