From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, Matt Roper <matthew.d.roper@intel.com>
Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915/display: call gmdid display probe at a higher level
Date: Tue, 12 Sep 2023 08:31:42 -0400 [thread overview]
Message-ID: <ZQBaLpCzfz6Mqyqb@intel.com> (raw)
In-Reply-To: <20230912120537.2158209-2-jani.nikula@intel.com>
On Tue, Sep 12, 2023 at 03:05:36PM +0300, Jani Nikula wrote:
> Move gmdid selection one abstraction level higher.
>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_device.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index ed564566e31b..4a6c4ee503b2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -851,15 +851,11 @@ probe_gmdid_display(struct drm_i915_private *i915, u16 *ver, u16 *rel, u16 *step
> }
>
> static const struct intel_display_device_info *
> -probe_display(struct drm_i915_private *i915, bool has_gmdid,
> - u16 *gmdid_ver, u16 *gmdid_rel, u16 *gmdid_step)
> +probe_display(struct drm_i915_private *i915)
> {
> struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
> int i;
>
> - if (has_gmdid)
> - return probe_gmdid_display(i915, gmdid_ver, gmdid_rel, gmdid_step);
> -
> if (has_no_display(pdev)) {
> drm_dbg_kms(&i915->drm, "Device doesn't have display\n");
> return &no_display;
> @@ -878,11 +874,16 @@ probe_display(struct drm_i915_private *i915, bool has_gmdid,
>
> void intel_display_device_probe(struct drm_i915_private *i915)
> {
> + const struct intel_display_device_info *info;
> u16 ver, rel, step;
>
> - /* Probe display support */
> - i915->display.info.__device_info = probe_display(i915, HAS_GMD_ID(i915),
> - &ver, &rel, &step);
> + if (HAS_GMD_ID(i915))
> + info = probe_gmdid_display(i915, &ver, &rel, &step);
> + else
> + info = probe_display(i915);
> +
> + i915->display.info.__device_info = info;
> +
> memcpy(DISPLAY_RUNTIME_INFO(i915),
> &DISPLAY_INFO(i915)->__runtime_defaults,
> sizeof(*DISPLAY_RUNTIME_INFO(i915)));
> --
> 2.39.2
>
next prev parent reply other threads:[~2023-09-12 12:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 12:05 [Intel-gfx] [PATCH 1/3] drm/i915: move more of the display probe to display code Jani Nikula
2023-09-12 12:05 ` [Intel-gfx] [PATCH 2/3] drm/i915/display: call gmdid display probe at a higher level Jani Nikula
2023-09-12 12:31 ` Rodrigo Vivi [this message]
2023-09-12 12:05 ` [Intel-gfx] [PATCH 3/3] drm/i915: move intel_display_device_probe() one level higher Jani Nikula
2023-09-12 12:32 ` Rodrigo Vivi
2023-09-12 20:57 ` Matt Roper
2023-09-12 21:35 ` Jani Nikula
2023-09-15 16:39 ` Jani Nikula
2023-09-12 12:31 ` [Intel-gfx] [PATCH 1/3] drm/i915: move more of the display probe to display code Rodrigo Vivi
2023-09-15 15:39 ` Jani Nikula
2023-09-12 19:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] " Patchwork
2023-09-12 20:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-09-12 23:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915: move more of the display probe to display code (rev2) Patchwork
2023-09-12 23:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-09-14 22:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915: move more of the display probe to display code (rev3) Patchwork
2023-09-14 23:00 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-09-15 6:46 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=ZQBaLpCzfz6Mqyqb@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=matthew.d.roper@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.