| Message ID | 20230516122926.2720581-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: fix intel_display_irq.c include order | expand |
Quoting Jani Nikula (2023-05-16 09:29:26) >I meant to sort the includes before submitting commit 2b874a027810 >("drm/i915/irq: split out display irq handling") but forgot, and it >wasn't noticed in review either. Sort the includes. Oops... My bad. > >Cc: Gustavo Sousa <gustavo.sousa@intel.com> >Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> >--- > drivers/gpu/drm/i915/display/intel_display_irq.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c >index 0eedd1ebb389..3b2a287d2041 100644 >--- a/drivers/gpu/drm/i915/display/intel_display_irq.c >+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c >@@ -3,23 +3,23 @@ > * Copyright © 2023 Intel Corporation > */ > >+#include "gt/intel_rps.h" > #include "i915_drv.h" > #include "i915_irq.h" > #include "i915_reg.h" > #include "icl_dsi_regs.h" >-#include "intel_display_irq.h" >-#include "intel_display_types.h" >-#include "intel_hotplug_irq.h" >-#include "intel_psr_regs.h" > #include "intel_crtc.h" >+#include "intel_de.h" >+#include "intel_display_irq.h" > #include "intel_display_trace.h" >+#include "intel_display_types.h" > #include "intel_dp_aux.h" >-#include "intel_gmbus.h" >+#include "intel_fdi_regs.h" > #include "intel_fifo_underrun.h" >+#include "intel_gmbus.h" >+#include "intel_hotplug_irq.h" > #include "intel_psr.h" >-#include "intel_fdi_regs.h" >-#include "gt/intel_rps.h" >-#include "intel_de.h" >+#include "intel_psr_regs.h" > > static void > intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe) >-- >2.39.2 >
On Tue, 16 May 2023, Gustavo Sousa <gustavo.sousa@intel.com> wrote: > Quoting Jani Nikula (2023-05-16 09:29:26) >>I meant to sort the includes before submitting commit 2b874a027810 >>("drm/i915/irq: split out display irq handling") but forgot, and it >>wasn't noticed in review either. Sort the includes. > > Oops... My bad. Nah, mine, really. > >> >>Cc: Gustavo Sousa <gustavo.sousa@intel.com> >>Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> Thanks, pushed to din. BR, Jani. > >>--- >> drivers/gpu/drm/i915/display/intel_display_irq.c | 16 ++++++++-------- >> 1 file changed, 8 insertions(+), 8 deletions(-) >> >>diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c >>index 0eedd1ebb389..3b2a287d2041 100644 >>--- a/drivers/gpu/drm/i915/display/intel_display_irq.c >>+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c >>@@ -3,23 +3,23 @@ >> * Copyright © 2023 Intel Corporation >> */ >> >>+#include "gt/intel_rps.h" >> #include "i915_drv.h" >> #include "i915_irq.h" >> #include "i915_reg.h" >> #include "icl_dsi_regs.h" >>-#include "intel_display_irq.h" >>-#include "intel_display_types.h" >>-#include "intel_hotplug_irq.h" >>-#include "intel_psr_regs.h" >> #include "intel_crtc.h" >>+#include "intel_de.h" >>+#include "intel_display_irq.h" >> #include "intel_display_trace.h" >>+#include "intel_display_types.h" >> #include "intel_dp_aux.h" >>-#include "intel_gmbus.h" >>+#include "intel_fdi_regs.h" >> #include "intel_fifo_underrun.h" >>+#include "intel_gmbus.h" >>+#include "intel_hotplug_irq.h" >> #include "intel_psr.h" >>-#include "intel_fdi_regs.h" >>-#include "gt/intel_rps.h" >>-#include "intel_de.h" >>+#include "intel_psr_regs.h" >> >> static void >> intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe) >>-- >>2.39.2 >>
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c index 0eedd1ebb389..3b2a287d2041 100644 --- a/drivers/gpu/drm/i915/display/intel_display_irq.c +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c @@ -3,23 +3,23 @@ * Copyright © 2023 Intel Corporation */ +#include "gt/intel_rps.h" #include "i915_drv.h" #include "i915_irq.h" #include "i915_reg.h" #include "icl_dsi_regs.h" -#include "intel_display_irq.h" -#include "intel_display_types.h" -#include "intel_hotplug_irq.h" -#include "intel_psr_regs.h" #include "intel_crtc.h" +#include "intel_de.h" +#include "intel_display_irq.h" #include "intel_display_trace.h" +#include "intel_display_types.h" #include "intel_dp_aux.h" -#include "intel_gmbus.h" +#include "intel_fdi_regs.h" #include "intel_fifo_underrun.h" +#include "intel_gmbus.h" +#include "intel_hotplug_irq.h" #include "intel_psr.h" -#include "intel_fdi_regs.h" -#include "gt/intel_rps.h" -#include "intel_de.h" +#include "intel_psr_regs.h" static void intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)
I meant to sort the includes before submitting commit 2b874a027810 ("drm/i915/irq: split out display irq handling") but forgot, and it wasn't noticed in review either. Sort the includes. Cc: Gustavo Sousa <gustavo.sousa@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display_irq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)