From: Jani Nikula <jani.nikula@intel.com>
To: "Grzelak, Michal" <michal.grzelak@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Subject: RE: [PATCH] drm/i915/irq: stop using HAS_GMCH()
Date: Mon, 12 May 2025 11:44:05 +0300 [thread overview]
Message-ID: <87ikm6jk16.fsf@intel.com> (raw)
In-Reply-To: <SJ0PR11MB5072EBF3E1FD471F0C82C6A88F8BA@SJ0PR11MB5072.namprd11.prod.outlook.com>
On Thu, 08 May 2025, "Grzelak, Michal" <michal.grzelak@intel.com> wrote:
> Hi Jani,
>
> -----Original Message-----
>> Right or wrong, HAS_GMCH() has become a display only thing. The last three users outside of display are in irq code. Reorder the if ladders to stop > using HAS_GMCH().
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Thanks for the review, pushed to drm-intel-next.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/i915_irq.c | 105 +++++++++++++++-----------------
>> 1 file changed, 48 insertions(+), 57 deletions(-)
>
>> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index d06694d6531e..1a3b504252c7 100644
>> --- a/drivers/gpu/drm/i915/i915_irq.c
>> +++ b/drivers/gpu/drm/i915/i915_irq.c
>> @@ -1175,71 +1175,62 @@ void intel_irq_fini(struct drm_i915_private *i915)
>>
>> static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv) {
>> - if (HAS_GMCH(dev_priv)) {
>> - if (IS_CHERRYVIEW(dev_priv))
>> - return cherryview_irq_handler;
>> - else if (IS_VALLEYVIEW(dev_priv))
>> - return valleyview_irq_handler;
>> - else if (GRAPHICS_VER(dev_priv) == 4)
>> - return i965_irq_handler;
>> - else
>> - return i915_irq_handler;
>> - } else {
>> - if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> - return dg1_irq_handler;
>> - else if (GRAPHICS_VER(dev_priv) >= 11)
>> - return gen11_irq_handler;
>> - else if (GRAPHICS_VER(dev_priv) >= 8)
>> - return gen8_irq_handler;
>> - else
>> - return ilk_irq_handler;
>> - }
>> + if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> + return dg1_irq_handler;
>> + else if (GRAPHICS_VER(dev_priv) >= 11)
>> + return gen11_irq_handler;
>> + else if (IS_CHERRYVIEW(dev_priv))
>> + return cherryview_irq_handler;
>> + else if (GRAPHICS_VER(dev_priv) >= 8)
>> + return gen8_irq_handler;
>> + else if (IS_VALLEYVIEW(dev_priv))
>> + return valleyview_irq_handler;
>> + else if (GRAPHICS_VER(dev_priv) >= 5)
>> + return ilk_irq_handler;
>> + else if (GRAPHICS_VER(dev_priv) == 4)
>> + return i965_irq_handler;
>> + else
>> + return i915_irq_handler;
>> }
>>
>> static void intel_irq_reset(struct drm_i915_private *dev_priv) {
>> - if (HAS_GMCH(dev_priv)) {
>> - if (IS_CHERRYVIEW(dev_priv))
>> - cherryview_irq_reset(dev_priv);
>> - else if (IS_VALLEYVIEW(dev_priv))
>> - valleyview_irq_reset(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) == 4)
>> - i965_irq_reset(dev_priv);
>> - else
>> - i915_irq_reset(dev_priv);
>> - } else {
>> - if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> - dg1_irq_reset(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) >= 11)
>> - gen11_irq_reset(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) >= 8)
>> - gen8_irq_reset(dev_priv);
>> - else
>> - ilk_irq_reset(dev_priv);
>> - }
>> + if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> + dg1_irq_reset(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 11)
>> + gen11_irq_reset(dev_priv);
>> + else if (IS_CHERRYVIEW(dev_priv))
>> + cherryview_irq_reset(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 8)
>> + gen8_irq_reset(dev_priv);
>> + else if (IS_VALLEYVIEW(dev_priv))
>> + valleyview_irq_reset(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 5)
>> + ilk_irq_reset(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) == 4)
>> + i965_irq_reset(dev_priv);
>> + else
>> + i915_irq_reset(dev_priv);
>> }
>>
>> static void intel_irq_postinstall(struct drm_i915_private *dev_priv) {
>> - if (HAS_GMCH(dev_priv)) {
>> - if (IS_CHERRYVIEW(dev_priv))
>> - cherryview_irq_postinstall(dev_priv);
>> - else if (IS_VALLEYVIEW(dev_priv))
>> - valleyview_irq_postinstall(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) == 4)
>> - i965_irq_postinstall(dev_priv);
>> - else
>> - i915_irq_postinstall(dev_priv);
>> - } else {
>> - if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> - dg1_irq_postinstall(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) >= 11)
>> - gen11_irq_postinstall(dev_priv);
>> - else if (GRAPHICS_VER(dev_priv) >= 8)
>> - gen8_irq_postinstall(dev_priv);
>> - else
>> - ilk_irq_postinstall(dev_priv);
>> - }
>> + if (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 10))
>> + dg1_irq_postinstall(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 11)
>> + gen11_irq_postinstall(dev_priv);
>> + else if (IS_CHERRYVIEW(dev_priv))
>> + cherryview_irq_postinstall(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 8)
>> + gen8_irq_postinstall(dev_priv);
>> + else if (IS_VALLEYVIEW(dev_priv))
>> + valleyview_irq_postinstall(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) >= 5)
>> + ilk_irq_postinstall(dev_priv);
>> + else if (GRAPHICS_VER(dev_priv) == 4)
>> + i965_irq_postinstall(dev_priv);
>> + else
>> + i915_irq_postinstall(dev_priv);
>> }
>
> Best regards,
> Michał
--
Jani Nikula, Intel
prev parent reply other threads:[~2025-05-12 8:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-02 12:07 [PATCH] drm/i915/irq: stop using HAS_GMCH() Jani Nikula
2025-05-02 14:07 ` ✓ i915.CI.BAT: success for " Patchwork
2025-05-02 19:09 ` ✗ i915.CI.Full: failure " Patchwork
2025-05-08 9:50 ` [PATCH] " Grzelak, Michal
2025-05-12 8:44 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ikm6jk16.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michal.grzelak@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox