| Message ID | 20210701173618.10718-1-tzimmermann@suse.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/i915: IRQ fixes | expand |
On Thu, Jul 01, 2021 at 07:36:16PM +0200, Thomas Zimmermann wrote: > Fix a bug in the usage of IRQs and cleanup references to the DRM > IRQ midlayer. > > Preferably this patchset would be merged through drm-misc-next. > > v5: > * go back to _hardirq() after CI tests reported atomic > context in PCI probe; add rsp comment > v4: > * switch IRQ code to intel_synchronize_irq() (Daniel) > v3: > * also use intel_synchronize_hardirq() from other callsite > v2: > * split patch > * also fix comment > * add intel_synchronize_hardirq() (Ville) > * update Fixes tag (Daniel) Ok now I actually pushed the right patch set. -Daniel > > Thomas Zimmermann (2): > drm/i915: Use the correct IRQ during resume > drm/i915: Drop all references to DRM IRQ midlayer > > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- > drivers/gpu/drm/i915/gt/intel_ring_submission.c | 7 +++++-- > drivers/gpu/drm/i915/i915_drv.c | 1 - > drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- > drivers/gpu/drm/i915/i915_irq.h | 1 + > 5 files changed, 12 insertions(+), 9 deletions(-) > > > base-commit: 67f5a18128770817e4218a9e496d2bf5047c51e8 > prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d > prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 > prerequisite-patch-id: 0cca17365e65370fa95d193ed2f1c88917ee1aef > prerequisite-patch-id: 12b9894350a0b56579d29542943465ef5134751c > prerequisite-patch-id: 3e1c37d3425f4820fe36ea3da57c65e166fe0ee5 > prerequisite-patch-id: 1017c860a0bf95ce370d82b8db1745f5548fb321 > prerequisite-patch-id: dcc022baab7c172978de9809702c2f4f54323047 > prerequisite-patch-id: 0d05ee247042b43d5ab8f3af216e708a8e09bee8 > prerequisite-patch-id: 110c411161bed6072c32185940fcd052d0bdb09a > prerequisite-patch-id: d2d1aeccffdfadf2b951487b8605f59c795d84cf > prerequisite-patch-id: 85fe31e27ca13adc0d1bcc7c19b1ce238a77ee6a > prerequisite-patch-id: c61fdacbe035ba5c17f1ff393bc9087f16aaea7b > prerequisite-patch-id: c4821af5dbba4d121769f1da85d91fbb53020ec0 > prerequisite-patch-id: 0b20ef3302abfe6dc123dbc54b9dd087865f935b > prerequisite-patch-id: d34eb96cbbdeb91870ace4250ea75920b1653dc2 > prerequisite-patch-id: 7f64fce347d15232134d7636ca7a8d9f5bf1a3a0 > prerequisite-patch-id: c83be7a285eb6682cdae0df401ab5d4c208f036b > prerequisite-patch-id: eb1a44d2eb2685cea154dd3f17f5f463dfafd39a > prerequisite-patch-id: 92a8c37dae4b8394fd6702f4af58ac7815ac3069 > prerequisite-patch-id: f0237988fe4ae6eba143432d1ace8beb52d935f8 > prerequisite-patch-id: bcf4d29437ed7cb78225dec4c99249eb40c18302 > prerequisite-patch-id: 6407b4c7f1b80af8d329d5f796b30da11959e936 > prerequisite-patch-id: 4a69e6e49d691b555f0e0874d638cd204dcb0c48 > prerequisite-patch-id: be09cfa8a67dd435a25103b85bd4b1649c5190a3 > prerequisite-patch-id: 813ecc9f94251c3d669155faf64c0c9e6a458393 > prerequisite-patch-id: beb2b5000a1682cbd74a7e2ab1566fcae5bccbf0 > prerequisite-patch-id: 754c8878611864475a0b75fd49ff38e71a21c795 > prerequisite-patch-id: d7d4bac3c19f94ba9593143b3c147d83d82cb71f > prerequisite-patch-id: 983d1efbe060743f5951e474961fa431d886d757 > prerequisite-patch-id: 3c78b20c3b9315cd39e0ae9ea1510c6121bf9ca9 > -- > 2.32.0 >
Hi Am 02.07.21 um 21:51 schrieb Daniel Vetter: > On Thu, Jul 01, 2021 at 07:36:16PM +0200, Thomas Zimmermann wrote: >> Fix a bug in the usage of IRQs and cleanup references to the DRM >> IRQ midlayer. >> >> Preferably this patchset would be merged through drm-misc-next. >> >> v5: >> * go back to _hardirq() after CI tests reported atomic >> context in PCI probe; add rsp comment >> v4: >> * switch IRQ code to intel_synchronize_irq() (Daniel) >> v3: >> * also use intel_synchronize_hardirq() from other callsite >> v2: >> * split patch >> * also fix comment >> * add intel_synchronize_hardirq() (Ville) >> * update Fixes tag (Daniel) > > Ok now I actually pushed the right patch set. Oh, I messed up. I forgot to reset the commit message in patch 1 v5. It's for v4 and contains the opposite of what's actually happening. Is it too late to fix this? If you can force-push into the branch, maybe simply replace the current message with the one for v3. [1] Best regards Thomas [1] https://patchwork.freedesktop.org/patch/441954/?series=92054&rev=2 > -Daniel > >> >> Thomas Zimmermann (2): >> drm/i915: Use the correct IRQ during resume >> drm/i915: Drop all references to DRM IRQ midlayer >> >> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- >> drivers/gpu/drm/i915/gt/intel_ring_submission.c | 7 +++++-- >> drivers/gpu/drm/i915/i915_drv.c | 1 - >> drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- >> drivers/gpu/drm/i915/i915_irq.h | 1 + >> 5 files changed, 12 insertions(+), 9 deletions(-) >> >> >> base-commit: 67f5a18128770817e4218a9e496d2bf5047c51e8 >> prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d >> prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 >> prerequisite-patch-id: 0cca17365e65370fa95d193ed2f1c88917ee1aef >> prerequisite-patch-id: 12b9894350a0b56579d29542943465ef5134751c >> prerequisite-patch-id: 3e1c37d3425f4820fe36ea3da57c65e166fe0ee5 >> prerequisite-patch-id: 1017c860a0bf95ce370d82b8db1745f5548fb321 >> prerequisite-patch-id: dcc022baab7c172978de9809702c2f4f54323047 >> prerequisite-patch-id: 0d05ee247042b43d5ab8f3af216e708a8e09bee8 >> prerequisite-patch-id: 110c411161bed6072c32185940fcd052d0bdb09a >> prerequisite-patch-id: d2d1aeccffdfadf2b951487b8605f59c795d84cf >> prerequisite-patch-id: 85fe31e27ca13adc0d1bcc7c19b1ce238a77ee6a >> prerequisite-patch-id: c61fdacbe035ba5c17f1ff393bc9087f16aaea7b >> prerequisite-patch-id: c4821af5dbba4d121769f1da85d91fbb53020ec0 >> prerequisite-patch-id: 0b20ef3302abfe6dc123dbc54b9dd087865f935b >> prerequisite-patch-id: d34eb96cbbdeb91870ace4250ea75920b1653dc2 >> prerequisite-patch-id: 7f64fce347d15232134d7636ca7a8d9f5bf1a3a0 >> prerequisite-patch-id: c83be7a285eb6682cdae0df401ab5d4c208f036b >> prerequisite-patch-id: eb1a44d2eb2685cea154dd3f17f5f463dfafd39a >> prerequisite-patch-id: 92a8c37dae4b8394fd6702f4af58ac7815ac3069 >> prerequisite-patch-id: f0237988fe4ae6eba143432d1ace8beb52d935f8 >> prerequisite-patch-id: bcf4d29437ed7cb78225dec4c99249eb40c18302 >> prerequisite-patch-id: 6407b4c7f1b80af8d329d5f796b30da11959e936 >> prerequisite-patch-id: 4a69e6e49d691b555f0e0874d638cd204dcb0c48 >> prerequisite-patch-id: be09cfa8a67dd435a25103b85bd4b1649c5190a3 >> prerequisite-patch-id: 813ecc9f94251c3d669155faf64c0c9e6a458393 >> prerequisite-patch-id: beb2b5000a1682cbd74a7e2ab1566fcae5bccbf0 >> prerequisite-patch-id: 754c8878611864475a0b75fd49ff38e71a21c795 >> prerequisite-patch-id: d7d4bac3c19f94ba9593143b3c147d83d82cb71f >> prerequisite-patch-id: 983d1efbe060743f5951e474961fa431d886d757 >> prerequisite-patch-id: 3c78b20c3b9315cd39e0ae9ea1510c6121bf9ca9 >> -- >> 2.32.0 >> >
On Sat, Jul 03, 2021 at 07:55:31PM +0200, Thomas Zimmermann wrote: > Hi > > Am 02.07.21 um 21:51 schrieb Daniel Vetter: > > On Thu, Jul 01, 2021 at 07:36:16PM +0200, Thomas Zimmermann wrote: > > > Fix a bug in the usage of IRQs and cleanup references to the DRM > > > IRQ midlayer. > > > > > > Preferably this patchset would be merged through drm-misc-next. > > > > > > v5: > > > * go back to _hardirq() after CI tests reported atomic > > > context in PCI probe; add rsp comment > > > v4: > > > * switch IRQ code to intel_synchronize_irq() (Daniel) > > > v3: > > > * also use intel_synchronize_hardirq() from other callsite > > > v2: > > > * split patch > > > * also fix comment > > > * add intel_synchronize_hardirq() (Ville) > > > * update Fixes tag (Daniel) > > > > Ok now I actually pushed the right patch set. > > Oh, I messed up. I forgot to reset the commit message in patch 1 v5. It's > for v4 and contains the opposite of what's actually happening. > > Is it too late to fix this? If you can force-push into the branch, maybe > simply replace the current message with the one for v3. [1] I already had to do a Fri-late-evening force push to fix my original mistake right after I pushed it. Now there's other stuff there, so too late unfortunately :-/ Anyway, not the worst screw-up and the Link: tag at least will point to this discussion here. -Daniel > > Best regards > Thomas > > [1] https://patchwork.freedesktop.org/patch/441954/?series=92054&rev=2 > > > -Daniel > > > > > > > > Thomas Zimmermann (2): > > > drm/i915: Use the correct IRQ during resume > > > drm/i915: Drop all references to DRM IRQ midlayer > > > > > > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- > > > drivers/gpu/drm/i915/gt/intel_ring_submission.c | 7 +++++-- > > > drivers/gpu/drm/i915/i915_drv.c | 1 - > > > drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- > > > drivers/gpu/drm/i915/i915_irq.h | 1 + > > > 5 files changed, 12 insertions(+), 9 deletions(-) > > > > > > > > > base-commit: 67f5a18128770817e4218a9e496d2bf5047c51e8 > > > prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d > > > prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 > > > prerequisite-patch-id: 0cca17365e65370fa95d193ed2f1c88917ee1aef > > > prerequisite-patch-id: 12b9894350a0b56579d29542943465ef5134751c > > > prerequisite-patch-id: 3e1c37d3425f4820fe36ea3da57c65e166fe0ee5 > > > prerequisite-patch-id: 1017c860a0bf95ce370d82b8db1745f5548fb321 > > > prerequisite-patch-id: dcc022baab7c172978de9809702c2f4f54323047 > > > prerequisite-patch-id: 0d05ee247042b43d5ab8f3af216e708a8e09bee8 > > > prerequisite-patch-id: 110c411161bed6072c32185940fcd052d0bdb09a > > > prerequisite-patch-id: d2d1aeccffdfadf2b951487b8605f59c795d84cf > > > prerequisite-patch-id: 85fe31e27ca13adc0d1bcc7c19b1ce238a77ee6a > > > prerequisite-patch-id: c61fdacbe035ba5c17f1ff393bc9087f16aaea7b > > > prerequisite-patch-id: c4821af5dbba4d121769f1da85d91fbb53020ec0 > > > prerequisite-patch-id: 0b20ef3302abfe6dc123dbc54b9dd087865f935b > > > prerequisite-patch-id: d34eb96cbbdeb91870ace4250ea75920b1653dc2 > > > prerequisite-patch-id: 7f64fce347d15232134d7636ca7a8d9f5bf1a3a0 > > > prerequisite-patch-id: c83be7a285eb6682cdae0df401ab5d4c208f036b > > > prerequisite-patch-id: eb1a44d2eb2685cea154dd3f17f5f463dfafd39a > > > prerequisite-patch-id: 92a8c37dae4b8394fd6702f4af58ac7815ac3069 > > > prerequisite-patch-id: f0237988fe4ae6eba143432d1ace8beb52d935f8 > > > prerequisite-patch-id: bcf4d29437ed7cb78225dec4c99249eb40c18302 > > > prerequisite-patch-id: 6407b4c7f1b80af8d329d5f796b30da11959e936 > > > prerequisite-patch-id: 4a69e6e49d691b555f0e0874d638cd204dcb0c48 > > > prerequisite-patch-id: be09cfa8a67dd435a25103b85bd4b1649c5190a3 > > > prerequisite-patch-id: 813ecc9f94251c3d669155faf64c0c9e6a458393 > > > prerequisite-patch-id: beb2b5000a1682cbd74a7e2ab1566fcae5bccbf0 > > > prerequisite-patch-id: 754c8878611864475a0b75fd49ff38e71a21c795 > > > prerequisite-patch-id: d7d4bac3c19f94ba9593143b3c147d83d82cb71f > > > prerequisite-patch-id: 983d1efbe060743f5951e474961fa431d886d757 > > > prerequisite-patch-id: 3c78b20c3b9315cd39e0ae9ea1510c6121bf9ca9 > > > -- > > > 2.32.0 > > > > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer >