Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 4/5] drm/i915: Make HW readout mark CRTC scaler as in use.
Date: Mon, 17 Dec 2018 10:50:23 +0100	[thread overview]
Message-ID: <20181217095024.2340-4-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20181217095024.2340-1-maarten.lankhorst@linux.intel.com>

This way we don't accidentally double allocate it and hopefully disable
it during fastset. I noticed this when I wrote a patch to sanity check
all of the scaler state.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2dd99e5437a5..825d9b9e7f28 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8849,6 +8849,7 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
 			pipe_config->pch_pfit.enabled = true;
 			pipe_config->pch_pfit.pos = I915_READ(SKL_PS_WIN_POS(crtc->pipe, i));
 			pipe_config->pch_pfit.size = I915_READ(SKL_PS_WIN_SZ(crtc->pipe, i));
+			scaler_state->scalers[i].in_use = true;
 			break;
 		}
 	}
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-12-17  9:50 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-17  9:50 [RESEND PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v2 Maarten Lankhorst
2018-12-17  9:50 ` [RESEND PATCH 2/5] drm/i915/backlight: Fix backlight takeover on LPT, v2 Maarten Lankhorst
2018-12-18  9:49   ` [HACK for CI] drm/i915: Update crtc scaler settings when update_pipe is set Maarten Lankhorst
2018-12-28 14:45   ` [RESEND PATCH 2/5] drm/i915/backlight: Fix backlight takeover on LPT, v2 Jani Nikula
2018-12-17  9:50 ` [RESEND PATCH 3/5] drm/i915: Enable fastset for non-boot modesets Maarten Lankhorst
2018-12-18 16:00   ` [RESEND, " Hans de Goede
2018-12-17  9:50 ` Maarten Lankhorst [this message]
2018-12-18 16:01   ` [4/5] drm/i915: Make HW readout mark CRTC scaler as in use Hans de Goede
2018-12-17  9:50 ` [RESEND PATCH 5/5] drm/i915: Re-enable fastset by default Maarten Lankhorst
2018-12-17 10:32 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2 Patchwork
2018-12-17 10:34 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-12-17 10:49 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-17 12:50 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-12-18 10:02 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev2) Patchwork
2018-12-18 10:28 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-18 11:38 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-12-21 13:57 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev3) Patchwork
2018-12-21 14:17 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-12-21 15:11 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev4) Patchwork
2018-12-21 15:29 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-12-21 18:37 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev5) Patchwork
2018-12-21 18:59 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-21 23:53 ` ✓ Fi.CI.IGT: " Patchwork
2018-12-28 10:10 ` [RESEND PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v2 Jani Nikula
2019-01-02 10:14   ` Maarten Lankhorst
  -- strict thread matches above, loose matches on Subject: below --
2019-01-08 16:08 [PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v3 Maarten Lankhorst
2019-01-08 16:08 ` [PATCH 4/5] drm/i915: Make HW readout mark CRTC scaler as in use Maarten Lankhorst

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=20181217095024.2340-4-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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