Mike Galbraith
2020-Dec-17 16:21 UTC
[bisected] Re: drm, qxl: post 5.11 merge warning+explosion
ee5d2a8e549e90325fcc31825269f89647cd6fac is the first bad commit
commit ee5d2a8e549e90325fcc31825269f89647cd6fac
Author: Christian K?nig <christian.koenig at amd.com>
Date: Sat Oct 24 13:10:28 2020 +0200
drm/ttm: wire up the new pool as default one v2
Provide the necessary parameters by all drivers and use the new pool alloc
when no driver specific function is provided.
v2: fix the GEM VRAM helpers
Signed-off-by: Christian K?nig <christian.koenig at amd.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Madhav Chauhan <madhav.chauhan at amd.com>
Tested-by: Huang Rui <ray.huang at amd.com>
Link: https://patchwork.freedesktop.org/patch/397081/?series=83051&rev=1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++--
drivers/gpu/drm/drm_gem_vram_helper.c | 4 ++--
drivers/gpu/drm/nouveau/nouveau_ttm.c | 14 +++++++++-----
drivers/gpu/drm/qxl/qxl_ttm.c | 5 ++---
drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++--
drivers/gpu/drm/ttm/ttm_bo.c | 8 ++++++--
drivers/gpu/drm/ttm/ttm_memory.c | 2 +-
drivers/gpu/drm/ttm/ttm_tt.c | 5 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +++--
include/drm/ttm/ttm_bo_driver.h | 11 +++++++----
10 files changed, 36 insertions(+), 26 deletions(-)
git bisect start 'drivers/gpu/drm/qxl'
# good: [2c85ebc57b3e1817b6ce1a6b703928e113a90442] Linux 5.10
git bisect good 2c85ebc57b3e1817b6ce1a6b703928e113a90442
# bad: [accefff5b547a9a1d959c7e76ad539bf2480e78b] Merge tag
'arm-soc-omap-genpd-5.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
git bisect bad accefff5b547a9a1d959c7e76ad539bf2480e78b
# bad: [d635a69dd4981cc51f90293f5f64268620ed1565] Merge tag
'net-next-5.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
git bisect bad d635a69dd4981cc51f90293f5f64268620ed1565
# bad: [0ca2ce81eb8ee30f3ba8ac7967fef9cfbb44dbdb] Merge tag
'arm64-upstream' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
git bisect bad 0ca2ce81eb8ee30f3ba8ac7967fef9cfbb44dbdb
# bad: [f8aab60422c371425365d386dfd51e0c6c5b1041] drm/amdgpu: Initialise
drm_gem_object_funcs for imported BOs
git bisect bad f8aab60422c371425365d386dfd51e0c6c5b1041
# bad: [c0f98d2f8b076bf3e3183aa547395f919c943a14] Merge tag
'drm-misc-next-2020-11-05' of git://anongit.freedesktop.org/drm/drm-misc
into drm-next
git bisect bad c0f98d2f8b076bf3e3183aa547395f919c943a14
# good: [6a6e5988a2657cd0c91f6f1a3e7d194599248b6d] drm/ttm: replace last
move_notify with delete_mem_notify
git bisect good 6a6e5988a2657cd0c91f6f1a3e7d194599248b6d
# good: [f566fdcd6cc49a9d5b5d782f56e3e7cb243f01b8] drm/i915: Force VT'd
workarounds when running as a guest OS
git bisect good f566fdcd6cc49a9d5b5d782f56e3e7cb243f01b8
# good: [e76ab2cf21c38331155ea613cdf18582f011c30f] drm/i915: Remove per-platform
IIR HPD masking
git bisect good e76ab2cf21c38331155ea613cdf18582f011c30f
# bad: [268af50f38b1f2199a2e85e38073d7a25c20190c] drm/panfrost: Support
cache-coherent integrations
git bisect bad 268af50f38b1f2199a2e85e38073d7a25c20190c
# good: [e000650375b65ff77c5ee852b5086f58c741179e] fbdev/atafb: Remove unused
extern variables
git bisect good e000650375b65ff77c5ee852b5086f58c741179e
# bad: [461619f5c3242aaee9ec3f0b7072719bd86ea207] drm/nouveau: switch to new
allocator
git bisect bad 461619f5c3242aaee9ec3f0b7072719bd86ea207
# good: [d099fc8f540add80f725014fdd4f7f49f3c58911] drm/ttm: new TT backend
allocation pool v3
git bisect good d099fc8f540add80f725014fdd4f7f49f3c58911
# bad: [e93b2da9799e5cb97760969f3e1f02a5bdac29fe] drm/amdgpu: switch to new
allocator v2
git bisect bad e93b2da9799e5cb97760969f3e1f02a5bdac29fe
# bad: [ee5d2a8e549e90325fcc31825269f89647cd6fac] drm/ttm: wire up the new pool
as default one v2
git bisect bad ee5d2a8e549e90325fcc31825269f89647cd6fac
# first bad commit: [ee5d2a8e549e90325fcc31825269f89647cd6fac] drm/ttm: wire up
the new pool as default one v2
Christian König
2020-Dec-17 16:24 UTC
[bisected] Re: drm, qxl: post 5.11 merge warning+explosion
Hi Mike, what exactly is the warning from qxl you are seeing? Thanks, Christian. Am 17.12.20 um 17:21 schrieb Mike Galbraith:> ee5d2a8e549e90325fcc31825269f89647cd6fac is the first bad commit > commit ee5d2a8e549e90325fcc31825269f89647cd6fac > Author: Christian K?nig <christian.koenig at amd.com> > Date: Sat Oct 24 13:10:28 2020 +0200 > > drm/ttm: wire up the new pool as default one v2 > > Provide the necessary parameters by all drivers and use the new pool alloc > when no driver specific function is provided. > > v2: fix the GEM VRAM helpers > > Signed-off-by: Christian K?nig <christian.koenig at amd.com> > Reviewed-by: Dave Airlie <airlied at redhat.com> > Reviewed-by: Madhav Chauhan <madhav.chauhan at amd.com> > Tested-by: Huang Rui <ray.huang at amd.com> > Link: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.freedesktop.org%2Fpatch%2F397081%2F%3Fseries%3D83051%26rev%3D1&data=04%7C01%7Cchristian.koenig%40amd.com%7C5e5b079ebef74f3ef56b08d8a2a7c416%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637438189325014013%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=7dT4qkc4SEBLYDZwl5V4glm9ynvFHwAVdzn3y7eO7Kc%3D&reserved=0 > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++-- > drivers/gpu/drm/drm_gem_vram_helper.c | 4 ++-- > drivers/gpu/drm/nouveau/nouveau_ttm.c | 14 +++++++++----- > drivers/gpu/drm/qxl/qxl_ttm.c | 5 ++--- > drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++-- > drivers/gpu/drm/ttm/ttm_bo.c | 8 ++++++-- > drivers/gpu/drm/ttm/ttm_memory.c | 2 +- > drivers/gpu/drm/ttm/ttm_tt.c | 5 ++--- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +++-- > include/drm/ttm/ttm_bo_driver.h | 11 +++++++---- > 10 files changed, 36 insertions(+), 26 deletions(-) > > git bisect start 'drivers/gpu/drm/qxl' > # good: [2c85ebc57b3e1817b6ce1a6b703928e113a90442] Linux 5.10 > git bisect good 2c85ebc57b3e1817b6ce1a6b703928e113a90442 > # bad: [accefff5b547a9a1d959c7e76ad539bf2480e78b] Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc > git bisect bad accefff5b547a9a1d959c7e76ad539bf2480e78b > # bad: [d635a69dd4981cc51f90293f5f64268620ed1565] Merge tag 'net-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next > git bisect bad d635a69dd4981cc51f90293f5f64268620ed1565 > # bad: [0ca2ce81eb8ee30f3ba8ac7967fef9cfbb44dbdb] Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux > git bisect bad 0ca2ce81eb8ee30f3ba8ac7967fef9cfbb44dbdb > # bad: [f8aab60422c371425365d386dfd51e0c6c5b1041] drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs > git bisect bad f8aab60422c371425365d386dfd51e0c6c5b1041 > # bad: [c0f98d2f8b076bf3e3183aa547395f919c943a14] Merge tag 'drm-misc-next-2020-11-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-next > git bisect bad c0f98d2f8b076bf3e3183aa547395f919c943a14 > # good: [6a6e5988a2657cd0c91f6f1a3e7d194599248b6d] drm/ttm: replace last move_notify with delete_mem_notify > git bisect good 6a6e5988a2657cd0c91f6f1a3e7d194599248b6d > # good: [f566fdcd6cc49a9d5b5d782f56e3e7cb243f01b8] drm/i915: Force VT'd workarounds when running as a guest OS > git bisect good f566fdcd6cc49a9d5b5d782f56e3e7cb243f01b8 > # good: [e76ab2cf21c38331155ea613cdf18582f011c30f] drm/i915: Remove per-platform IIR HPD masking > git bisect good e76ab2cf21c38331155ea613cdf18582f011c30f > # bad: [268af50f38b1f2199a2e85e38073d7a25c20190c] drm/panfrost: Support cache-coherent integrations > git bisect bad 268af50f38b1f2199a2e85e38073d7a25c20190c > # good: [e000650375b65ff77c5ee852b5086f58c741179e] fbdev/atafb: Remove unused extern variables > git bisect good e000650375b65ff77c5ee852b5086f58c741179e > # bad: [461619f5c3242aaee9ec3f0b7072719bd86ea207] drm/nouveau: switch to new allocator > git bisect bad 461619f5c3242aaee9ec3f0b7072719bd86ea207 > # good: [d099fc8f540add80f725014fdd4f7f49f3c58911] drm/ttm: new TT backend allocation pool v3 > git bisect good d099fc8f540add80f725014fdd4f7f49f3c58911 > # bad: [e93b2da9799e5cb97760969f3e1f02a5bdac29fe] drm/amdgpu: switch to new allocator v2 > git bisect bad e93b2da9799e5cb97760969f3e1f02a5bdac29fe > # bad: [ee5d2a8e549e90325fcc31825269f89647cd6fac] drm/ttm: wire up the new pool as default one v2 > git bisect bad ee5d2a8e549e90325fcc31825269f89647cd6fac > # first bad commit: [ee5d2a8e549e90325fcc31825269f89647cd6fac] drm/ttm: wire up the new pool as default one v2 >