From: Jani Nikula <jani.nikula@linux.intel.com>
To: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>,
intel-gfx@lists.freedesktop.org, Imre Deak <imre.deak@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH 05/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
Date: Tue, 21 Apr 2020 10:53:12 +0300 [thread overview]
Message-ID: <87tv1dz34n.fsf@intel.com> (raw)
In-Reply-To: <20200406112800.23762-6-pankaj.laxminarayan.bharadiya@intel.com>
Pankaj, the subject line is identical to patch 4, please update.
Imre, one question inline for you.
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 433e5a81dd4d..5475f989df4c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -1850,22 +1850,29 @@ static u64 __async_put_domains_mask(struct i915_power_domains *power_domains)
> static bool
> assert_async_put_domain_masks_disjoint(struct i915_power_domains *power_domains)
> {
> - return !WARN_ON(power_domains->async_put_domains[0] &
> - power_domains->async_put_domains[1]);
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> + return !drm_WARN_ON(&i915->drm, power_domains->async_put_domains[0] &
> + power_domains->async_put_domains[1]);
> }
Do we want to depend on struct i915_power_domains being a struct
drm_i915_private member via container_of?
BR,
Jani.
>
> static bool
> __async_put_domains_state_ok(struct i915_power_domains *power_domains)
> {
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> enum intel_display_power_domain domain;
> bool err = false;
>
> err |= !assert_async_put_domain_masks_disjoint(power_domains);
> - err |= WARN_ON(!!power_domains->async_put_wakeref !=
> - !!__async_put_domains_mask(power_domains));
> + err |= drm_WARN_ON(&i915->drm, !!power_domains->async_put_wakeref !=
> + !!__async_put_domains_mask(power_domains));
>
> for_each_power_domain(domain, __async_put_domains_mask(power_domains))
> - err |= WARN_ON(power_domains->domain_use_count[domain] != 1);
> + err |= drm_WARN_ON(&i915->drm,
> + power_domains->domain_use_count[domain] != 1);
>
> return !err;
> }
> @@ -2107,11 +2114,14 @@ static void
> queue_async_put_domains_work(struct i915_power_domains *power_domains,
> intel_wakeref_t wakeref)
> {
> - WARN_ON(power_domains->async_put_wakeref);
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> + drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref);
> power_domains->async_put_wakeref = wakeref;
> - WARN_ON(!queue_delayed_work(system_unbound_wq,
> - &power_domains->async_put_work,
> - msecs_to_jiffies(100)));
> + drm_WARN_ON(&i915->drm, !queue_delayed_work(system_unbound_wq,
> + &power_domains->async_put_work,
> + msecs_to_jiffies(100)));
> }
>
> static void
> @@ -4318,6 +4328,9 @@ __set_power_wells(struct i915_power_domains *power_domains,
> const struct i915_power_well_desc *power_well_descs,
> int power_well_count)
> {
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> u64 power_well_ids = 0;
> int i;
>
> @@ -4337,8 +4350,8 @@ __set_power_wells(struct i915_power_domains *power_domains,
> if (id == DISP_PW_ID_NONE)
> continue;
>
> - WARN_ON(id >= sizeof(power_well_ids) * 8);
> - WARN_ON(power_well_ids & BIT_ULL(id));
> + drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) * 8);
> + drm_WARN_ON(&i915->drm, power_well_ids & BIT_ULL(id));
> power_well_ids |= BIT_ULL(id);
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-04-21 7:53 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 11:27 [PATCH 00/18] Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 18:08 ` kbuild test robot
2020-04-06 18:08 ` kbuild test robot
2020-04-06 18:08 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 02/18] drm/i915/display/atomic_plane: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 20:21 ` kbuild test robot
2020-04-06 20:21 ` kbuild test robot
2020-04-06 20:21 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 04/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 05/18] " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 7:53 ` Jani Nikula [this message]
2020-04-21 9:19 ` Imre Deak
2020-04-06 11:27 ` [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:56 ` Jani Nikula
2020-04-21 6:56 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 07/18] drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 08/18] drm/i915/display/frontbuffer: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 09/18] drm/i915/display/global_state: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 10/18] drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:55 ` Jani Nikula
2020-04-21 6:55 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:57 ` Jani Nikula
2020-04-21 6:57 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 13/18] drm/i915/display/vlv_dsi: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 22:41 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 14/18] drm/i915/gem: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:30 ` Jani Nikula
2020-04-06 11:27 ` [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:24 ` Jani Nikula
2020-04-21 8:24 ` [Intel-gfx] " Jani Nikula
2020-04-21 9:59 ` Bharadiya,Pankaj
2020-04-21 9:59 ` [Intel-gfx] " Bharadiya,Pankaj
2020-04-06 11:27 ` [PATCH 16/18] drm/i915/pmu: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 17/18] drm/i915/pm: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:26 ` Jani Nikula
2020-04-21 8:26 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:28 ` [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:28 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:28 ` Jani Nikula
2020-04-21 9:48 ` Imre Deak
2020-04-06 11:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-04-06 12:28 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-04-06 14:47 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prefer drm_WARN* over WARN* (rev2) Patchwork
2020-04-06 15:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-04-06 19:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-04-21 8:35 ` [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN* Jani Nikula
2020-04-21 10:01 ` Bharadiya,Pankaj
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=87tv1dz34n.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=pankaj.laxminarayan.bharadiya@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.