From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 10/13] drm/i915: Use crtc->state in intel_fbdev_init_bios
Date: Wed, 3 Oct 2018 17:18:56 +0300 [thread overview]
Message-ID: <20181003141856.GC9144@intel.com> (raw)
In-Reply-To: <20181003133715.3713-11-maarten.lankhorst@linux.intel.com>
On Wed, Oct 03, 2018 at 03:37:12PM +0200, Maarten Lankhorst wrote:
> fbdev init shouldn't race with userspace since it's called from
> intel_modeset_init, so it's safe to dereference crtc->state and
> assume nothing changed yet.
>
> At least not more harmful than crtc->config.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index f99332972b7a..2480c7d6edee 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -593,7 +593,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
> * pipe. Note we need to use the selected fb's pitch and bpp
> * rather than the current pipe's, since they differ.
> */
> - cur_size = intel_crtc->config->base.adjusted_mode.crtc_hdisplay;
> + cur_size = crtc->state->adjusted_mode.crtc_hdisplay;
Yeah, we're alreday looking at crtc->state->active above, so this should
equally safe.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> cur_size = cur_size * fb->base.format->cpp[0];
> if (fb->base.pitches[0] < cur_size) {
> DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
> @@ -603,13 +603,13 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
> break;
> }
>
> - cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
> + cur_size = crtc->state->adjusted_mode.crtc_vdisplay;
> cur_size = intel_fb_align_height(&fb->base, 0, cur_size);
> cur_size *= fb->base.pitches[0];
> DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
> pipe_name(intel_crtc->pipe),
> - intel_crtc->config->base.adjusted_mode.crtc_hdisplay,
> - intel_crtc->config->base.adjusted_mode.crtc_vdisplay,
> + crtc->state->adjusted_mode.crtc_hdisplay,
> + crtc->state->adjusted_mode.crtc_vdisplay,
> fb->base.format->cpp[0] * 8,
> cur_size);
>
> --
> 2.19.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-10-03 14:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 13:37 [PATCH 00/13] drm/i915: First cleanup pass to get rid of more crtc->config users Maarten Lankhorst
2018-10-03 13:37 ` [PATCH 01/13] drm/i915: Remove dereferences of crtc->config in set_pipeconf/misc functions Maarten Lankhorst
2018-10-03 13:54 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 02/13] drm/i915: Make panel fitter functions take state Maarten Lankhorst
2018-10-03 13:59 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 03/13] drm/i915: Make intel_set_pipe_timings/src_size take a pointer to crtc_state Maarten Lankhorst
2018-10-03 14:01 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 04/13] drm/i915: Use crtc_state in ironlake_enable_pch_transcoder Maarten Lankhorst
2018-10-03 14:05 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 05/13] drm/i915: Make skl_detach_scalers take crtc_state Maarten Lankhorst
2018-10-03 14:07 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 06/13] drm/i915: Make pll functions " Maarten Lankhorst
2018-10-03 14:11 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 07/13] drm/i915: Make ironlake_pch_transcoder_set_timings " Maarten Lankhorst
2018-10-03 14:11 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 08/13] drm/i915: Make shared dpll functions " Maarten Lankhorst
2018-10-03 14:15 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 09/13] drm/i915: Get rid of crtc->config from icl_pll_to_ddi_pll_sel Maarten Lankhorst
2018-10-03 14:16 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 10/13] drm/i915: Use crtc->state in intel_fbdev_init_bios Maarten Lankhorst
2018-10-03 14:18 ` Ville Syrjälä [this message]
2018-10-03 13:37 ` [PATCH 11/13] drm/i915: Get rid of crtc->config dereference in intel_dp_retrain_link Maarten Lankhorst
2018-10-03 14:21 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 12/13] drm/i915: Get rid of crtc->config in chv_data_lane_soft_reset Maarten Lankhorst
2018-10-03 14:21 ` Ville Syrjälä
2018-10-03 13:37 ` [PATCH 13/13] drm/i915: Get rid of intel_crtc->config in crtc_enable/disable functions Maarten Lankhorst
2018-10-03 14:24 ` Ville Syrjälä
2018-10-03 14:41 ` ✗ Fi.CI.BAT: failure for drm/i915: First cleanup pass to get rid of more crtc->config users 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=20181003141856.GC9144@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.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;
as well as URLs for NNTP newsgroup(s).