2011-12-14 04:19:38 +07:00
|
|
|
/*
|
|
|
|
* Copyright © 2011 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Jesse Barnes <jbarnes@virtuousgeek.org>
|
|
|
|
*
|
|
|
|
* New plane/sprite handling.
|
|
|
|
*
|
|
|
|
* The older chips had a separate interface for programming plane related
|
|
|
|
* registers; newer ones are much simpler and we can use the new DRM plane
|
|
|
|
* support.
|
|
|
|
*/
|
2012-10-03 00:01:07 +07:00
|
|
|
#include <drm/drmP.h>
|
2017-08-01 23:58:16 +07:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2012-10-03 00:01:07 +07:00
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_fourcc.h>
|
2013-04-24 22:52:38 +07:00
|
|
|
#include <drm/drm_rect.h>
|
2015-04-16 05:15:02 +07:00
|
|
|
#include <drm/drm_atomic.h>
|
2014-12-24 01:41:52 +07:00
|
|
|
#include <drm/drm_plane_helper.h>
|
2011-12-14 04:19:38 +07:00
|
|
|
#include "intel_drv.h"
|
2016-08-04 22:32:35 +07:00
|
|
|
#include "intel_frontbuffer.h"
|
2012-10-03 00:01:07 +07:00
|
|
|
#include <drm/i915_drm.h>
|
2011-12-14 04:19:38 +07:00
|
|
|
#include "i915_drv.h"
|
|
|
|
|
2016-05-18 15:34:38 +07:00
|
|
|
int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
|
|
|
|
int usecs)
|
2014-04-29 17:35:46 +07:00
|
|
|
{
|
|
|
|
/* paranoia */
|
2015-09-25 20:37:43 +07:00
|
|
|
if (!adjusted_mode->crtc_htotal)
|
2014-04-29 17:35:46 +07:00
|
|
|
return 1;
|
|
|
|
|
2015-09-25 20:37:43 +07:00
|
|
|
return DIV_ROUND_UP(usecs * adjusted_mode->crtc_clock,
|
|
|
|
1000 * adjusted_mode->crtc_htotal);
|
2014-04-29 17:35:46 +07:00
|
|
|
}
|
|
|
|
|
2017-10-10 16:18:16 +07:00
|
|
|
/* FIXME: We should instead only take spinlocks once for the entire update
|
|
|
|
* instead of once per mmio. */
|
|
|
|
#if IS_ENABLED(CONFIG_PROVE_LOCKING)
|
|
|
|
#define VBLANK_EVASION_TIME_US 250
|
|
|
|
#else
|
2017-02-28 21:28:48 +07:00
|
|
|
#define VBLANK_EVASION_TIME_US 100
|
2017-10-10 16:18:16 +07:00
|
|
|
#endif
|
2017-02-28 21:28:48 +07:00
|
|
|
|
2014-10-28 20:10:12 +07:00
|
|
|
/**
|
|
|
|
* intel_pipe_update_start() - start update of a set of display registers
|
2017-08-23 22:22:21 +07:00
|
|
|
* @new_crtc_state: the new crtc state
|
2014-10-28 20:10:12 +07:00
|
|
|
*
|
|
|
|
* Mark the start of an update to pipe registers that should be updated
|
|
|
|
* atomically regarding vblank. If the next vblank will happens within
|
|
|
|
* the next 100 us, this function waits until the vblank passes.
|
|
|
|
*
|
|
|
|
* After a successful call to this function, interrupts will be disabled
|
|
|
|
* until a subsequent call to intel_pipe_update_end(). That is done to
|
2017-08-23 22:22:21 +07:00
|
|
|
* avoid random delays.
|
2014-10-28 20:10:12 +07:00
|
|
|
*/
|
2017-08-23 22:22:21 +07:00
|
|
|
void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
|
2014-04-29 17:35:46 +07:00
|
|
|
{
|
2017-08-23 22:22:21 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->base.crtc);
|
2016-12-16 00:47:34 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2017-08-23 22:22:21 +07:00
|
|
|
const struct drm_display_mode *adjusted_mode = &new_crtc_state->base.adjusted_mode;
|
2014-04-29 17:35:46 +07:00
|
|
|
long timeout = msecs_to_jiffies_timeout(1);
|
|
|
|
int scanline, min, max, vblank_start;
|
2014-05-22 23:00:50 +07:00
|
|
|
wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);
|
2016-12-16 00:47:34 +07:00
|
|
|
bool need_vlv_dsi_wa = (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
|
2017-08-23 22:22:21 +07:00
|
|
|
intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI);
|
2014-04-29 17:35:46 +07:00
|
|
|
DEFINE_WAIT(wait);
|
2018-08-22 05:11:54 +07:00
|
|
|
u32 psr_status;
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-09-08 17:40:45 +07:00
|
|
|
vblank_start = adjusted_mode->crtc_vblank_start;
|
|
|
|
if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
|
2014-04-29 17:35:46 +07:00
|
|
|
vblank_start = DIV_ROUND_UP(vblank_start, 2);
|
|
|
|
|
|
|
|
/* FIXME needs to be calibrated sensibly */
|
2017-02-28 21:28:48 +07:00
|
|
|
min = vblank_start - intel_usecs_to_scanlines(adjusted_mode,
|
|
|
|
VBLANK_EVASION_TIME_US);
|
2014-04-29 17:35:46 +07:00
|
|
|
max = vblank_start - 1;
|
|
|
|
|
|
|
|
if (min <= 0 || max <= 0)
|
drm/i915: Wait for PSR exit before checking for vblank evasion
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then
the pipe_update_start call schedules itself out to check back later.
On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but
lags w.r.t core kernel code, hot plugging an external display triggers
tons of "potential atomic update errors" in the dmesg, on *pipe A*. A
closer analysis reveals that we try to read the scanline 3 times and
eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL
stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some*
reason we loop inside intel_pipe_update start for ~2+ msec which in this
case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL
counter, hence no error. On the other hand, the ChromeOS kernel spends
~1.1 msec looping inside intel_pipe_update_start and hence errors out
b/c the source is still in PSR.
Regardless, we should wait for PSR exit (if PSR is disabled, we incur
a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't
fully exited PSR, then checking for vblank evasion isn't actually
applicable.
v4: Comment explaining psr_wait after enabling VBL interrupts (DK)
v5: CAN_PSR() to handle platforms that don't support PSR.
v6: Handle local_irq_disable on early return (Chris)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180627200250.1515-2-tarun.vyas@intel.com
2018-06-28 03:02:50 +07:00
|
|
|
goto irq_disable;
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-02-14 03:03:45 +07:00
|
|
|
if (WARN_ON(drm_crtc_vblank_get(&crtc->base)))
|
drm/i915: Wait for PSR exit before checking for vblank evasion
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then
the pipe_update_start call schedules itself out to check back later.
On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but
lags w.r.t core kernel code, hot plugging an external display triggers
tons of "potential atomic update errors" in the dmesg, on *pipe A*. A
closer analysis reveals that we try to read the scanline 3 times and
eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL
stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some*
reason we loop inside intel_pipe_update start for ~2+ msec which in this
case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL
counter, hence no error. On the other hand, the ChromeOS kernel spends
~1.1 msec looping inside intel_pipe_update_start and hence errors out
b/c the source is still in PSR.
Regardless, we should wait for PSR exit (if PSR is disabled, we incur
a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't
fully exited PSR, then checking for vblank evasion isn't actually
applicable.
v4: Comment explaining psr_wait after enabling VBL interrupts (DK)
v5: CAN_PSR() to handle platforms that don't support PSR.
v6: Handle local_irq_disable on early return (Chris)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180627200250.1515-2-tarun.vyas@intel.com
2018-06-28 03:02:50 +07:00
|
|
|
goto irq_disable;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait for psr to idle out after enabling the VBL interrupts
|
|
|
|
* VBL interrupts will start the PSR exit and prevent a PSR
|
|
|
|
* re-entry as well.
|
|
|
|
*/
|
2018-08-22 05:11:54 +07:00
|
|
|
if (intel_psr_wait_for_idle(new_crtc_state, &psr_status))
|
|
|
|
DRM_ERROR("PSR idle timed out 0x%x, atomic update may fail\n",
|
|
|
|
psr_status);
|
drm/i915: Wait for PSR exit before checking for vblank evasion
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then
the pipe_update_start call schedules itself out to check back later.
On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but
lags w.r.t core kernel code, hot plugging an external display triggers
tons of "potential atomic update errors" in the dmesg, on *pipe A*. A
closer analysis reveals that we try to read the scanline 3 times and
eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL
stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some*
reason we loop inside intel_pipe_update start for ~2+ msec which in this
case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL
counter, hence no error. On the other hand, the ChromeOS kernel spends
~1.1 msec looping inside intel_pipe_update_start and hence errors out
b/c the source is still in PSR.
Regardless, we should wait for PSR exit (if PSR is disabled, we incur
a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't
fully exited PSR, then checking for vblank evasion isn't actually
applicable.
v4: Comment explaining psr_wait after enabling VBL interrupts (DK)
v5: CAN_PSR() to handle platforms that don't support PSR.
v6: Handle local_irq_disable on early return (Chris)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180627200250.1515-2-tarun.vyas@intel.com
2018-06-28 03:02:50 +07:00
|
|
|
|
|
|
|
local_irq_disable();
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-09-17 22:08:32 +07:00
|
|
|
crtc->debug.min_vbl = min;
|
|
|
|
crtc->debug.max_vbl = max;
|
|
|
|
trace_i915_pipe_update_start(crtc);
|
2014-04-29 17:35:48 +07:00
|
|
|
|
2014-04-29 17:35:46 +07:00
|
|
|
for (;;) {
|
|
|
|
/*
|
|
|
|
* prepare_to_wait() has a memory barrier, which guarantees
|
|
|
|
* other CPUs can see the task state update by the time we
|
|
|
|
* read the scanline.
|
|
|
|
*/
|
2014-05-22 23:00:50 +07:00
|
|
|
prepare_to_wait(wq, &wait, TASK_UNINTERRUPTIBLE);
|
2014-04-29 17:35:46 +07:00
|
|
|
|
|
|
|
scanline = intel_get_crtc_scanline(crtc);
|
|
|
|
if (scanline < min || scanline > max)
|
|
|
|
break;
|
|
|
|
|
2018-05-03 06:33:00 +07:00
|
|
|
if (!timeout) {
|
2014-04-29 17:35:46 +07:00
|
|
|
DRM_ERROR("Potential atomic update failure on pipe %c\n",
|
|
|
|
pipe_name(crtc->pipe));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
local_irq_enable();
|
|
|
|
|
|
|
|
timeout = schedule_timeout(timeout);
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
}
|
|
|
|
|
2014-05-22 23:00:50 +07:00
|
|
|
finish_wait(wq, &wait);
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-02-14 03:03:45 +07:00
|
|
|
drm_crtc_vblank_put(&crtc->base);
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2016-12-16 00:47:34 +07:00
|
|
|
/*
|
|
|
|
* On VLV/CHV DSI the scanline counter would appear to
|
|
|
|
* increment approx. 1/3 of a scanline before start of vblank.
|
|
|
|
* The registers still get latched at start of vblank however.
|
|
|
|
* This means we must not write any registers on the first
|
|
|
|
* line of vblank (since not the whole line is actually in
|
|
|
|
* vblank). And unfortunately we can't use the interrupt to
|
|
|
|
* wait here since it will fire too soon. We could use the
|
|
|
|
* frame start interrupt instead since it will fire after the
|
|
|
|
* critical scanline, but that would require more changes
|
|
|
|
* in the interrupt code. So for now we'll just do the nasty
|
|
|
|
* thing and poll for the bad scanline to pass us by.
|
|
|
|
*
|
|
|
|
* FIXME figure out if BXT+ DSI suffers from this as well
|
|
|
|
*/
|
|
|
|
while (need_vlv_dsi_wa && scanline == vblank_start)
|
|
|
|
scanline = intel_get_crtc_scanline(crtc);
|
|
|
|
|
2015-09-16 04:19:32 +07:00
|
|
|
crtc->debug.scanline_start = scanline;
|
|
|
|
crtc->debug.start_vbl_time = ktime_get();
|
2016-05-17 20:07:48 +07:00
|
|
|
crtc->debug.start_vbl_count = intel_crtc_get_vblank_counter(crtc);
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-09-17 22:08:32 +07:00
|
|
|
trace_i915_pipe_update_vblank_evaded(crtc);
|
drm/i915: Wait for PSR exit before checking for vblank evasion
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then
the pipe_update_start call schedules itself out to check back later.
On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but
lags w.r.t core kernel code, hot plugging an external display triggers
tons of "potential atomic update errors" in the dmesg, on *pipe A*. A
closer analysis reveals that we try to read the scanline 3 times and
eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL
stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some*
reason we loop inside intel_pipe_update start for ~2+ msec which in this
case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL
counter, hence no error. On the other hand, the ChromeOS kernel spends
~1.1 msec looping inside intel_pipe_update_start and hence errors out
b/c the source is still in PSR.
Regardless, we should wait for PSR exit (if PSR is disabled, we incur
a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't
fully exited PSR, then checking for vblank evasion isn't actually
applicable.
v4: Comment explaining psr_wait after enabling VBL interrupts (DK)
v5: CAN_PSR() to handle platforms that don't support PSR.
v6: Handle local_irq_disable on early return (Chris)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180627200250.1515-2-tarun.vyas@intel.com
2018-06-28 03:02:50 +07:00
|
|
|
return;
|
|
|
|
|
|
|
|
irq_disable:
|
|
|
|
local_irq_disable();
|
2014-04-29 17:35:46 +07:00
|
|
|
}
|
|
|
|
|
2014-10-28 20:10:12 +07:00
|
|
|
/**
|
|
|
|
* intel_pipe_update_end() - end update of a set of display registers
|
2017-08-23 22:22:21 +07:00
|
|
|
* @new_crtc_state: the new crtc state
|
2014-10-28 20:10:12 +07:00
|
|
|
*
|
|
|
|
* Mark the end of an update started with intel_pipe_update_start(). This
|
|
|
|
* re-enables interrupts and verifies the update was actually completed
|
2017-08-23 22:22:21 +07:00
|
|
|
* before a vblank.
|
2014-10-28 20:10:12 +07:00
|
|
|
*/
|
2017-08-23 22:22:21 +07:00
|
|
|
void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)
|
2014-04-29 17:35:46 +07:00
|
|
|
{
|
2017-08-23 22:22:21 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->base.crtc);
|
2014-04-29 17:35:46 +07:00
|
|
|
enum pipe pipe = crtc->pipe;
|
2015-09-16 04:19:32 +07:00
|
|
|
int scanline_end = intel_get_crtc_scanline(crtc);
|
2016-05-17 20:07:48 +07:00
|
|
|
u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc);
|
2015-09-01 17:15:33 +07:00
|
|
|
ktime_t end_vbl_time = ktime_get();
|
2017-03-09 03:14:03 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2014-04-29 17:35:46 +07:00
|
|
|
|
2015-09-17 22:08:32 +07:00
|
|
|
trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end);
|
2014-04-29 17:35:48 +07:00
|
|
|
|
2016-06-13 21:13:45 +07:00
|
|
|
/* We're still in the vblank-evade critical section, this can't race.
|
|
|
|
* Would be slightly nice to just grab the vblank count and arm the
|
|
|
|
* event outside of the critical section - the spinlock might spin for a
|
|
|
|
* while ... */
|
2017-08-23 22:22:21 +07:00
|
|
|
if (new_crtc_state->base.event) {
|
2016-06-13 21:13:45 +07:00
|
|
|
WARN_ON(drm_crtc_vblank_get(&crtc->base) != 0);
|
|
|
|
|
|
|
|
spin_lock(&crtc->base.dev->event_lock);
|
2017-08-23 22:22:21 +07:00
|
|
|
drm_crtc_arm_vblank_event(&crtc->base, new_crtc_state->base.event);
|
2016-06-13 21:13:45 +07:00
|
|
|
spin_unlock(&crtc->base.dev->event_lock);
|
|
|
|
|
2017-08-23 22:22:21 +07:00
|
|
|
new_crtc_state->base.event = NULL;
|
2016-06-13 21:13:45 +07:00
|
|
|
}
|
|
|
|
|
2014-04-29 17:35:46 +07:00
|
|
|
local_irq_enable();
|
|
|
|
|
2017-03-09 03:14:03 +07:00
|
|
|
if (intel_vgpu_active(dev_priv))
|
|
|
|
return;
|
|
|
|
|
2015-09-16 04:19:32 +07:00
|
|
|
if (crtc->debug.start_vbl_count &&
|
|
|
|
crtc->debug.start_vbl_count != end_vbl_count) {
|
|
|
|
DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us, min %d, max %d, scanline start %d, end %d\n",
|
|
|
|
pipe_name(pipe), crtc->debug.start_vbl_count,
|
|
|
|
end_vbl_count,
|
|
|
|
ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time),
|
|
|
|
crtc->debug.min_vbl, crtc->debug.max_vbl,
|
|
|
|
crtc->debug.scanline_start, scanline_end);
|
2017-05-08 00:12:52 +07:00
|
|
|
}
|
|
|
|
#ifdef CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
|
|
|
|
else if (ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time) >
|
|
|
|
VBLANK_EVASION_TIME_US)
|
2017-02-28 21:28:48 +07:00
|
|
|
DRM_WARN("Atomic update on pipe (%c) took %lld us, max time under evasion is %u us\n",
|
|
|
|
pipe_name(pipe),
|
|
|
|
ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time),
|
|
|
|
VBLANK_EVASION_TIME_US);
|
2017-05-08 00:12:52 +07:00
|
|
|
#endif
|
2014-04-29 17:35:46 +07:00
|
|
|
}
|
|
|
|
|
2017-10-18 03:08:09 +07:00
|
|
|
void
|
2017-03-28 01:55:33 +07:00
|
|
|
skl_update_plane(struct intel_plane *plane,
|
2016-01-07 17:54:06 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
2013-12-04 07:49:41 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
|
|
|
enum plane_id plane_id = plane->id;
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-24 02:27:09 +07:00
|
|
|
u32 plane_ctl = plane_state->ctl;
|
2016-01-07 17:54:06 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
2016-01-28 21:53:54 +07:00
|
|
|
u32 surf_addr = plane_state->main.offset;
|
2016-02-16 03:54:41 +07:00
|
|
|
unsigned int rotation = plane_state->base.rotation;
|
2016-01-28 23:33:11 +07:00
|
|
|
u32 stride = skl_plane_stride(fb, 0, rotation);
|
2017-08-01 23:58:13 +07:00
|
|
|
u32 aux_stride = skl_plane_stride(fb, 1, rotation);
|
2016-07-26 23:06:59 +07:00
|
|
|
int crtc_x = plane_state->base.dst.x1;
|
|
|
|
int crtc_y = plane_state->base.dst.y1;
|
|
|
|
uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);
|
|
|
|
uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);
|
2016-01-28 21:53:54 +07:00
|
|
|
uint32_t x = plane_state->main.x;
|
|
|
|
uint32_t y = plane_state->main.y;
|
2016-07-26 23:06:59 +07:00
|
|
|
uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;
|
|
|
|
uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;
|
2017-03-09 22:44:33 +07:00
|
|
|
unsigned long irqflags;
|
2013-12-04 07:49:41 +07:00
|
|
|
|
drm/i915: Rewrite fb rotation GTT handling
Redo the fb rotation handling in order to:
- eliminate the NV12 special casing
- handle fb->offsets[] properly
- make the rotation handling easier for the plane code
To achieve these goals we reduce intel_rotation_info to only contain
(for each plane) the rotated view width,height,stride in tile units,
and the page offset into the object where the plane starts. Each plane
is handled exactly the same way, no special casing for NV12 or other
formats. We then store the computed rotation_info under
intel_framebuffer so that we don't have to recompute it again.
To handle fb->offsets[] we treat them as a linear offsets and convert
them to x/y offsets from the start of the relevant GTT mapping (either
normal or rotated). We store the x/y offsets under intel_framebuffer,
and for some extra convenience we also store the rotated pitch (ie.
tile aligned plane height). So for each plane we have the normal
x/y offsets, rotated x/y offsets, and the rotated pitch. The normal
pitch is available already in fb->pitches[].
While we're gathering up all that extra information, we can also easily
compute the storage requirements for the framebuffer, so that we can
check that the object is big enough to hold it.
When it comes time to deal with the plane source coordinates, we first
rotate the clipped src coordinates to match the relevant GTT view
orientation, then add to them the fb x/y offsets. Next we compute
the aligned surface page offset, and as a result we're left with some
residual x/y offsets. Finally, if required by the hardware, we convert
the remaining x/y offsets into a linear offset.
For gen2/3 we simply skip computing the final page offset, and just
convert the src+fb x/y offsets directly into a linear offset since
that's what the hardware wants.
After this all platforms, incluing SKL+, compute these things in exactly
the same way (excluding alignemnt differences).
v2: Use BIT(DRM_ROTATE_270) instead of ROTATE_270 when rotating
plane src coordinates
Drop some spurious changes that got left behind during
development
v3: Split out more changes to prep patches (Daniel)
s/intel_fb->plane[].foo.bar/intel_fb->foo[].bar/ for brevity
Rename intel_surf_gtt_offset to intel_fb_gtt_offset
Kill the pointless 'plane' parameter from intel_fb_gtt_offset()
v4: Fix alignment vs. alignment-1 when calling
_intel_compute_tile_offset() from intel_fill_fb_info()
Pass the pitch in tiles in
stad of pixels to intel_adjust_tile_offset() from intel_fill_fb_info()
Pass the full width/height of the rotated area to
drm_rect_rotate() for clarity
Use u32 for more offsets
v5: Preserve the upper_32_bits()/lower_32_bits() handling for the
fb ggtt offset (Sivakumar)
v6: Rebase due to drm_plane_state src/dst rects
Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-2-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-09-15 17:16:41 +07:00
|
|
|
/* Sizes are 0 based */
|
|
|
|
src_w--;
|
|
|
|
src_h--;
|
|
|
|
crtc_w--;
|
|
|
|
crtc_h--;
|
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
2017-11-14 01:11:28 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id),
|
2017-11-14 01:11:28 +07:00
|
|
|
plane_state->color_ctl);
|
2018-02-15 02:23:24 +07:00
|
|
|
|
2017-03-09 22:44:32 +07:00
|
|
|
if (key->flags) {
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_KEYVAL(pipe, plane_id), key->min_value);
|
|
|
|
I915_WRITE_FW(PLANE_KEYMAX(pipe, plane_id), key->max_value);
|
|
|
|
I915_WRITE_FW(PLANE_KEYMSK(pipe, plane_id), key->channel_mask);
|
2017-03-09 22:44:32 +07:00
|
|
|
}
|
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_OFFSET(pipe, plane_id), (y << 16) | x);
|
|
|
|
I915_WRITE_FW(PLANE_STRIDE(pipe, plane_id), stride);
|
|
|
|
I915_WRITE_FW(PLANE_SIZE(pipe, plane_id), (src_h << 16) | src_w);
|
2017-08-01 23:58:13 +07:00
|
|
|
I915_WRITE_FW(PLANE_AUX_DIST(pipe, plane_id),
|
|
|
|
(plane_state->aux.offset - surf_addr) | aux_stride);
|
|
|
|
I915_WRITE_FW(PLANE_AUX_OFFSET(pipe, plane_id),
|
|
|
|
(plane_state->aux.y << 16) | plane_state->aux.x);
|
2015-04-16 05:15:02 +07:00
|
|
|
|
|
|
|
/* program plane scaler */
|
2016-01-07 17:54:06 +07:00
|
|
|
if (plane_state->scaler_id >= 0) {
|
|
|
|
int scaler_id = plane_state->scaler_id;
|
2018-05-22 01:56:13 +07:00
|
|
|
const struct intel_scaler *scaler =
|
|
|
|
&crtc_state->scaler_state.scalers[scaler_id];
|
|
|
|
u16 y_hphase, uv_rgb_hphase;
|
|
|
|
u16 y_vphase, uv_rgb_vphase;
|
|
|
|
|
|
|
|
/* TODO: handle sub-pixel coordinates */
|
|
|
|
if (fb->format->format == DRM_FORMAT_NV12) {
|
|
|
|
y_hphase = skl_scaler_calc_phase(1, false);
|
|
|
|
y_vphase = skl_scaler_calc_phase(1, false);
|
|
|
|
|
|
|
|
/* MPEG2 chroma siting convention */
|
|
|
|
uv_rgb_hphase = skl_scaler_calc_phase(2, true);
|
|
|
|
uv_rgb_vphase = skl_scaler_calc_phase(2, false);
|
|
|
|
} else {
|
|
|
|
/* not used */
|
|
|
|
y_hphase = 0;
|
|
|
|
y_vphase = 0;
|
2015-04-16 05:15:02 +07:00
|
|
|
|
2018-05-22 01:56:13 +07:00
|
|
|
uv_rgb_hphase = skl_scaler_calc_phase(1, false);
|
|
|
|
uv_rgb_vphase = skl_scaler_calc_phase(1, false);
|
|
|
|
}
|
2016-05-12 20:18:49 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SKL_PS_CTRL(pipe, scaler_id),
|
|
|
|
PS_SCALER_EN | PS_PLANE_SEL(plane_id) | scaler->mode);
|
|
|
|
I915_WRITE_FW(SKL_PS_PWR_GATE(pipe, scaler_id), 0);
|
2018-05-22 01:56:13 +07:00
|
|
|
I915_WRITE_FW(SKL_PS_VPHASE(pipe, scaler_id),
|
|
|
|
PS_Y_PHASE(y_vphase) | PS_UV_RGB_PHASE(uv_rgb_vphase));
|
|
|
|
I915_WRITE_FW(SKL_PS_HPHASE(pipe, scaler_id),
|
|
|
|
PS_Y_PHASE(y_hphase) | PS_UV_RGB_PHASE(uv_rgb_hphase));
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SKL_PS_WIN_POS(pipe, scaler_id), (crtc_x << 16) | crtc_y);
|
|
|
|
I915_WRITE_FW(SKL_PS_WIN_SZ(pipe, scaler_id),
|
|
|
|
((crtc_w + 1) << 16)|(crtc_h + 1));
|
2015-04-16 05:15:02 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_POS(pipe, plane_id), 0);
|
2015-04-16 05:15:02 +07:00
|
|
|
} else {
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) | crtc_x);
|
2015-04-16 05:15:02 +07:00
|
|
|
}
|
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_CTL(pipe, plane_id), plane_ctl);
|
|
|
|
I915_WRITE_FW(PLANE_SURF(pipe, plane_id),
|
|
|
|
intel_plane_ggtt_offset(plane_state) + surf_addr);
|
|
|
|
POSTING_READ_FW(PLANE_SURF(pipe, plane_id));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2013-12-04 07:49:41 +07:00
|
|
|
}
|
|
|
|
|
2017-10-18 03:08:10 +07:00
|
|
|
void
|
2017-03-28 01:55:33 +07:00
|
|
|
skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)
|
2013-12-04 07:49:41 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum plane_id plane_id = plane->id;
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-09 22:44:33 +07:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
2013-12-04 07:49:41 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_CTL(pipe, plane_id), 0);
|
2013-12-04 07:49:41 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(PLANE_SURF(pipe, plane_id), 0);
|
|
|
|
POSTING_READ_FW(PLANE_SURF(pipe, plane_id));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2013-12-04 07:49:41 +07:00
|
|
|
}
|
|
|
|
|
2017-11-18 02:19:08 +07:00
|
|
|
bool
|
2018-01-31 03:38:03 +07:00
|
|
|
skl_plane_get_hw_state(struct intel_plane *plane,
|
|
|
|
enum pipe *pipe)
|
2017-11-18 02:19:08 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum intel_display_power_domain power_domain;
|
|
|
|
enum plane_id plane_id = plane->id;
|
|
|
|
bool ret;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
power_domain = POWER_DOMAIN_PIPE(plane->pipe);
|
2017-11-18 02:19:08 +07:00
|
|
|
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
|
|
|
|
return false;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
ret = I915_READ(PLANE_CTL(plane->pipe, plane_id)) & PLANE_CTL_ENABLE;
|
|
|
|
|
|
|
|
*pipe = plane->pipe;
|
2017-11-18 02:19:08 +07:00
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, power_domain);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-10-20 23:47:53 +07:00
|
|
|
static void
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
chv_update_csc(const struct intel_plane_state *plane_state)
|
2014-10-20 23:47:53 +07:00
|
|
|
{
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
2017-03-28 01:55:33 +07:00
|
|
|
enum plane_id plane_id = plane->id;
|
2014-10-20 23:47:53 +07:00
|
|
|
/*
|
2018-02-15 02:23:25 +07:00
|
|
|
* |r| | c0 c1 c2 | |cr|
|
|
|
|
* |g| = | c3 c4 c5 | x |y |
|
|
|
|
* |b| | c6 c7 c8 | |cb|
|
2014-10-20 23:47:53 +07:00
|
|
|
*
|
2018-02-15 02:23:25 +07:00
|
|
|
* Coefficients are s3.12.
|
2014-10-20 23:47:53 +07:00
|
|
|
*
|
2018-02-15 02:23:25 +07:00
|
|
|
* Cb and Cr apparently come in as signed already, and
|
|
|
|
* we always get full range data in on account of CLRC0/1.
|
2014-10-20 23:47:53 +07:00
|
|
|
*/
|
2018-02-15 02:23:25 +07:00
|
|
|
static const s16 csc_matrix[][9] = {
|
|
|
|
/* BT.601 full range YCbCr -> full range RGB */
|
|
|
|
[DRM_COLOR_YCBCR_BT601] = {
|
|
|
|
5743, 4096, 0,
|
|
|
|
-2925, 4096, -1410,
|
|
|
|
0, 4096, 7258,
|
|
|
|
},
|
|
|
|
/* BT.709 full range YCbCr -> full range RGB */
|
|
|
|
[DRM_COLOR_YCBCR_BT709] = {
|
|
|
|
6450, 4096, 0,
|
|
|
|
-1917, 4096, -767,
|
|
|
|
0, 4096, 7601,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
const s16 *csc = csc_matrix[plane_state->base.color_encoding];
|
2014-10-20 23:47:53 +07:00
|
|
|
|
|
|
|
/* Seems RGB data bypasses the CSC always */
|
2018-07-18 00:13:43 +07:00
|
|
|
if (!fb->format->is_yuv)
|
2014-10-20 23:47:53 +07:00
|
|
|
return;
|
|
|
|
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
I915_WRITE_FW(SPCSCYGOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPCSCCBOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
|
|
|
|
I915_WRITE_FW(SPCSCCROFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
|
|
|
|
|
2018-02-15 02:23:25 +07:00
|
|
|
I915_WRITE_FW(SPCSCC01(plane_id), SPCSC_C1(csc[1]) | SPCSC_C0(csc[0]));
|
|
|
|
I915_WRITE_FW(SPCSCC23(plane_id), SPCSC_C1(csc[3]) | SPCSC_C0(csc[2]));
|
|
|
|
I915_WRITE_FW(SPCSCC45(plane_id), SPCSC_C1(csc[5]) | SPCSC_C0(csc[4]));
|
|
|
|
I915_WRITE_FW(SPCSCC67(plane_id), SPCSC_C1(csc[7]) | SPCSC_C0(csc[6]));
|
|
|
|
I915_WRITE_FW(SPCSCC8(plane_id), SPCSC_C0(csc[8]));
|
2017-03-09 22:44:33 +07:00
|
|
|
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
I915_WRITE_FW(SPCSCYGICLAMP(plane_id), SPCSC_IMAX(1023) | SPCSC_IMIN(0));
|
|
|
|
I915_WRITE_FW(SPCSCCBICLAMP(plane_id), SPCSC_IMAX(512) | SPCSC_IMIN(-512));
|
|
|
|
I915_WRITE_FW(SPCSCCRICLAMP(plane_id), SPCSC_IMAX(512) | SPCSC_IMIN(-512));
|
2017-03-09 22:44:33 +07:00
|
|
|
|
|
|
|
I915_WRITE_FW(SPCSCYGOCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
|
|
|
|
I915_WRITE_FW(SPCSCCBOCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
|
|
|
|
I915_WRITE_FW(SPCSCCROCLAMP(plane_id), SPCSC_OMAX(1023) | SPCSC_OMIN(0));
|
2014-10-20 23:47:53 +07:00
|
|
|
}
|
|
|
|
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
#define SIN_0 0
|
|
|
|
#define COS_0 1
|
|
|
|
|
|
|
|
static void
|
|
|
|
vlv_update_clrc(const struct intel_plane_state *plane_state)
|
|
|
|
{
|
|
|
|
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
|
|
|
enum pipe pipe = plane->pipe;
|
|
|
|
enum plane_id plane_id = plane->id;
|
|
|
|
int contrast, brightness, sh_scale, sh_sin, sh_cos;
|
|
|
|
|
2018-07-18 00:13:43 +07:00
|
|
|
if (fb->format->is_yuv &&
|
2018-02-15 02:23:27 +07:00
|
|
|
plane_state->base.color_range == DRM_COLOR_YCBCR_LIMITED_RANGE) {
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
/*
|
|
|
|
* Expand limited range to full range:
|
|
|
|
* Contrast is applied first and is used to expand Y range.
|
|
|
|
* Brightness is applied second and is used to remove the
|
|
|
|
* offset from Y. Saturation/hue is used to expand CbCr range.
|
|
|
|
*/
|
|
|
|
contrast = DIV_ROUND_CLOSEST(255 << 6, 235 - 16);
|
|
|
|
brightness = -DIV_ROUND_CLOSEST(16 * 255, 235 - 16);
|
|
|
|
sh_scale = DIV_ROUND_CLOSEST(128 << 7, 240 - 128);
|
|
|
|
sh_sin = SIN_0 * sh_scale;
|
|
|
|
sh_cos = COS_0 * sh_scale;
|
|
|
|
} else {
|
|
|
|
/* Pass-through everything. */
|
|
|
|
contrast = 1 << 6;
|
|
|
|
brightness = 0;
|
|
|
|
sh_scale = 1 << 7;
|
|
|
|
sh_sin = SIN_0 * sh_scale;
|
|
|
|
sh_cos = COS_0 * sh_scale;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME these register are single buffered :( */
|
|
|
|
I915_WRITE_FW(SPCLRC0(pipe, plane_id),
|
|
|
|
SP_CONTRAST(contrast) | SP_BRIGHTNESS(brightness));
|
|
|
|
I915_WRITE_FW(SPCLRC1(pipe, plane_id),
|
|
|
|
SP_SH_SIN(sh_sin) | SP_SH_COS(sh_cos));
|
|
|
|
}
|
|
|
|
|
2017-03-18 04:17:58 +07:00
|
|
|
static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
2013-04-03 01:22:20 +07:00
|
|
|
{
|
2017-03-18 04:17:58 +07:00
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
2016-11-08 03:20:55 +07:00
|
|
|
unsigned int rotation = plane_state->base.rotation;
|
2016-01-07 17:54:06 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
2017-03-18 04:17:58 +07:00
|
|
|
u32 sprctl;
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2017-03-18 04:17:58 +07:00
|
|
|
sprctl = SP_ENABLE | SP_GAMMA_ENABLE;
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2016-12-15 04:32:55 +07:00
|
|
|
switch (fb->format->format) {
|
2013-04-03 01:22:20 +07:00
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
sprctl |= SP_FORMAT_YUV422 | SP_YUV_ORDER_YUYV;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
sprctl |= SP_FORMAT_YUV422 | SP_YUV_ORDER_YVYU;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
sprctl |= SP_FORMAT_YUV422 | SP_YUV_ORDER_UYVY;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
sprctl |= SP_FORMAT_YUV422 | SP_YUV_ORDER_VYUY;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
sprctl |= SP_FORMAT_BGR565;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
sprctl |= SP_FORMAT_BGRX8888;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_ARGB8888:
|
|
|
|
sprctl |= SP_FORMAT_BGRA8888;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XBGR2101010:
|
|
|
|
sprctl |= SP_FORMAT_RGBX1010102;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_ABGR2101010:
|
|
|
|
sprctl |= SP_FORMAT_RGBA1010102;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XBGR8888:
|
|
|
|
sprctl |= SP_FORMAT_RGBX8888;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_ABGR8888:
|
|
|
|
sprctl |= SP_FORMAT_RGBA8888;
|
|
|
|
break;
|
|
|
|
default:
|
2017-03-18 04:17:58 +07:00
|
|
|
MISSING_CASE(fb->format->format);
|
|
|
|
return 0;
|
2013-04-03 01:22:20 +07:00
|
|
|
}
|
|
|
|
|
2018-02-15 02:23:25 +07:00
|
|
|
if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
|
|
|
|
sprctl |= SP_YUV_FORMAT_BT709;
|
|
|
|
|
2016-11-16 18:33:16 +07:00
|
|
|
if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2013-04-03 01:22:20 +07:00
|
|
|
sprctl |= SP_TILED;
|
|
|
|
|
2017-05-20 03:50:17 +07:00
|
|
|
if (rotation & DRM_MODE_ROTATE_180)
|
2016-11-14 23:53:59 +07:00
|
|
|
sprctl |= SP_ROTATE_180;
|
|
|
|
|
2017-05-20 03:50:17 +07:00
|
|
|
if (rotation & DRM_MODE_REFLECT_X)
|
2016-11-14 23:54:00 +07:00
|
|
|
sprctl |= SP_MIRROR;
|
|
|
|
|
2017-03-09 22:44:32 +07:00
|
|
|
if (key->flags & I915_SET_COLORKEY_SOURCE)
|
|
|
|
sprctl |= SP_SOURCE_KEY;
|
|
|
|
|
2017-03-18 04:17:58 +07:00
|
|
|
return sprctl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
vlv_update_plane(struct intel_plane *plane,
|
2017-03-18 04:17:58 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
|
|
|
enum pipe pipe = plane->pipe;
|
|
|
|
enum plane_id plane_id = plane->id;
|
2017-03-24 02:27:09 +07:00
|
|
|
u32 sprctl = plane_state->ctl;
|
2017-03-24 02:27:12 +07:00
|
|
|
u32 sprsurf_offset = plane_state->main.offset;
|
|
|
|
u32 linear_offset;
|
2017-03-18 04:17:58 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
|
|
|
int crtc_x = plane_state->base.dst.x1;
|
|
|
|
int crtc_y = plane_state->base.dst.y1;
|
|
|
|
uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);
|
|
|
|
uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);
|
2017-03-24 02:27:12 +07:00
|
|
|
uint32_t x = plane_state->main.x;
|
|
|
|
uint32_t y = plane_state->main.y;
|
2017-03-18 04:17:58 +07:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
2013-04-03 01:22:20 +07:00
|
|
|
/* Sizes are 0 based */
|
|
|
|
crtc_w--;
|
|
|
|
crtc_h--;
|
|
|
|
|
2016-01-20 23:02:50 +07:00
|
|
|
linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);
|
drm/i915: Rewrite fb rotation GTT handling
Redo the fb rotation handling in order to:
- eliminate the NV12 special casing
- handle fb->offsets[] properly
- make the rotation handling easier for the plane code
To achieve these goals we reduce intel_rotation_info to only contain
(for each plane) the rotated view width,height,stride in tile units,
and the page offset into the object where the plane starts. Each plane
is handled exactly the same way, no special casing for NV12 or other
formats. We then store the computed rotation_info under
intel_framebuffer so that we don't have to recompute it again.
To handle fb->offsets[] we treat them as a linear offsets and convert
them to x/y offsets from the start of the relevant GTT mapping (either
normal or rotated). We store the x/y offsets under intel_framebuffer,
and for some extra convenience we also store the rotated pitch (ie.
tile aligned plane height). So for each plane we have the normal
x/y offsets, rotated x/y offsets, and the rotated pitch. The normal
pitch is available already in fb->pitches[].
While we're gathering up all that extra information, we can also easily
compute the storage requirements for the framebuffer, so that we can
check that the object is big enough to hold it.
When it comes time to deal with the plane source coordinates, we first
rotate the clipped src coordinates to match the relevant GTT view
orientation, then add to them the fb x/y offsets. Next we compute
the aligned surface page offset, and as a result we're left with some
residual x/y offsets. Finally, if required by the hardware, we convert
the remaining x/y offsets into a linear offset.
For gen2/3 we simply skip computing the final page offset, and just
convert the src+fb x/y offsets directly into a linear offset since
that's what the hardware wants.
After this all platforms, incluing SKL+, compute these things in exactly
the same way (excluding alignemnt differences).
v2: Use BIT(DRM_ROTATE_270) instead of ROTATE_270 when rotating
plane src coordinates
Drop some spurious changes that got left behind during
development
v3: Split out more changes to prep patches (Daniel)
s/intel_fb->plane[].foo.bar/intel_fb->foo[].bar/ for brevity
Rename intel_surf_gtt_offset to intel_fb_gtt_offset
Kill the pointless 'plane' parameter from intel_fb_gtt_offset()
v4: Fix alignment vs. alignment-1 when calling
_intel_compute_tile_offset() from intel_fill_fb_info()
Pass the pitch in tiles in
stad of pixels to intel_adjust_tile_offset() from intel_fill_fb_info()
Pass the full width/height of the rotated area to
drm_rect_rotate() for clarity
Use u32 for more offsets
v5: Preserve the upper_32_bits()/lower_32_bits() handling for the
fb ggtt offset (Sivakumar)
v6: Rebase due to drm_plane_state src/dst rects
Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-2-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-09-15 17:16:41 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
vlv_update_clrc(plane_state);
|
|
|
|
|
2017-03-09 22:44:32 +07:00
|
|
|
if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)
|
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
Turns out the VLV/CHV fixed function sprite CSC expects full range
data as input. We've been feeding it limited range data to it all
along. To expand the data out to full range we'll use the color
correction registers (brightness, contrast, and saturation).
On CHV pipe B we were actually doing the right thing already because we
progammed the custom CSC matrix to do expect limited range input. Now
that well pre-expand the data out with the color correction unit, we
need to change the CSC matrix to operate with full range input instead.
This should make the sprite output of the other pipes match the sprite
output of pipe B reasonably well. Looking at the resulting pipe CRCs,
there can be a slight difference in the output, but as I don't know
the formula used by the fixed function CSC of the other pipes, I don't
think it's worth the effort to try to match the output exactly. It
might not even be possible due to difference in internal precision etc.
One slight caveat here is that the color correction registers are single
bufferred, so we should really be updating them during vblank, but we
still don't have a mechanism for that, so just toss in another FIXME.
v2: Rebase
v3: s/bri/brightness/ s/con/contrast/ (Shashank)
v4: Clarify the constants and math (Shashank)
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Tang, Jun" <jun.tang@intel.com>
Reported-by: "Tang, Jun" <jun.tang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 7f1f3851feb0 ("drm/i915: sprite support for ValleyView v4")
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214192327.3250-5-ville.syrjala@linux.intel.com
2018-02-15 02:23:23 +07:00
|
|
|
chv_update_csc(plane_state);
|
2017-03-09 22:44:32 +07:00
|
|
|
|
2015-03-20 02:18:57 +07:00
|
|
|
if (key->flags) {
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPKEYMINVAL(pipe, plane_id), key->min_value);
|
|
|
|
I915_WRITE_FW(SPKEYMAXVAL(pipe, plane_id), key->max_value);
|
|
|
|
I915_WRITE_FW(SPKEYMSK(pipe, plane_id), key->channel_mask);
|
2015-03-20 02:18:57 +07:00
|
|
|
}
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPSTRIDE(pipe, plane_id), fb->pitches[0]);
|
|
|
|
I915_WRITE_FW(SPPOS(pipe, plane_id), (crtc_y << 16) | crtc_x);
|
2014-01-18 01:09:03 +07:00
|
|
|
|
2016-11-16 18:33:16 +07:00
|
|
|
if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPTILEOFF(pipe, plane_id), (y << 16) | x);
|
2013-04-03 01:22:20 +07:00
|
|
|
else
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPLINOFF(pipe, plane_id), linear_offset);
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPCONSTALPHA(pipe, plane_id), 0);
|
2014-10-17 00:52:34 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPSIZE(pipe, plane_id), (crtc_h << 16) | crtc_w);
|
|
|
|
I915_WRITE_FW(SPCNTR(pipe, plane_id), sprctl);
|
|
|
|
I915_WRITE_FW(SPSURF(pipe, plane_id),
|
|
|
|
intel_plane_ggtt_offset(plane_state) + sprsurf_offset);
|
|
|
|
POSTING_READ_FW(SPSURF(pipe, plane_id));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2013-04-03 01:22:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
vlv_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)
|
2013-04-03 01:22:20 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum pipe pipe = plane->pipe;
|
|
|
|
enum plane_id plane_id = plane->id;
|
2017-03-09 22:44:33 +07:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPCNTR(pipe, plane_id), 0);
|
2015-03-19 22:57:13 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPSURF(pipe, plane_id), 0);
|
|
|
|
POSTING_READ_FW(SPSURF(pipe, plane_id));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2013-04-03 01:22:20 +07:00
|
|
|
}
|
|
|
|
|
2017-11-18 02:19:08 +07:00
|
|
|
static bool
|
2018-01-31 03:38:03 +07:00
|
|
|
vlv_plane_get_hw_state(struct intel_plane *plane,
|
|
|
|
enum pipe *pipe)
|
2017-11-18 02:19:08 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum intel_display_power_domain power_domain;
|
|
|
|
enum plane_id plane_id = plane->id;
|
|
|
|
bool ret;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
power_domain = POWER_DOMAIN_PIPE(plane->pipe);
|
2017-11-18 02:19:08 +07:00
|
|
|
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
|
|
|
|
return false;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
ret = I915_READ(SPCNTR(plane->pipe, plane_id)) & SP_ENABLE;
|
|
|
|
|
|
|
|
*pipe = plane->pipe;
|
2017-11-18 02:19:08 +07:00
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, power_domain);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-03-18 04:17:59 +07:00
|
|
|
static u32 ivb_sprite_ctl(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2017-03-18 04:17:59 +07:00
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
to_i915(plane_state->base.plane->dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
2016-02-16 03:54:41 +07:00
|
|
|
unsigned int rotation = plane_state->base.rotation;
|
2016-01-07 17:54:06 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
2017-03-18 04:17:59 +07:00
|
|
|
u32 sprctl;
|
|
|
|
|
|
|
|
sprctl = SPRITE_ENABLE | SPRITE_GAMMA_ENABLE;
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2017-03-18 04:17:59 +07:00
|
|
|
if (IS_IVYBRIDGE(dev_priv))
|
|
|
|
sprctl |= SPRITE_TRICKLE_FEED_DISABLE;
|
|
|
|
|
|
|
|
if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
|
|
|
|
sprctl |= SPRITE_PIPE_CSC_ENABLE;
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2016-12-15 04:32:55 +07:00
|
|
|
switch (fb->format->format) {
|
2011-12-14 04:19:38 +07:00
|
|
|
case DRM_FORMAT_XBGR8888:
|
2012-08-23 13:38:57 +07:00
|
|
|
sprctl |= SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX;
|
2011-12-14 04:19:38 +07:00
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
2012-08-23 13:38:57 +07:00
|
|
|
sprctl |= SPRITE_FORMAT_RGBX888;
|
2011-12-14 04:19:38 +07:00
|
|
|
break;
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YUYV;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YVYU;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_UYVY;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;
|
|
|
|
break;
|
|
|
|
default:
|
2017-03-18 04:17:59 +07:00
|
|
|
MISSING_CASE(fb->format->format);
|
|
|
|
return 0;
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
2018-02-15 02:23:25 +07:00
|
|
|
if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
|
|
|
|
sprctl |= SPRITE_YUV_TO_RGB_CSC_FORMAT_BT709;
|
|
|
|
|
2018-02-15 02:23:27 +07:00
|
|
|
if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
|
|
|
|
sprctl |= SPRITE_YUV_RANGE_CORRECTION_DISABLE;
|
|
|
|
|
2016-11-16 18:33:16 +07:00
|
|
|
if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2011-12-14 04:19:38 +07:00
|
|
|
sprctl |= SPRITE_TILED;
|
|
|
|
|
2017-05-20 03:50:17 +07:00
|
|
|
if (rotation & DRM_MODE_ROTATE_180)
|
2016-11-14 23:53:59 +07:00
|
|
|
sprctl |= SPRITE_ROTATE_180;
|
|
|
|
|
2017-03-09 22:44:32 +07:00
|
|
|
if (key->flags & I915_SET_COLORKEY_DESTINATION)
|
|
|
|
sprctl |= SPRITE_DEST_KEY;
|
|
|
|
else if (key->flags & I915_SET_COLORKEY_SOURCE)
|
|
|
|
sprctl |= SPRITE_SOURCE_KEY;
|
|
|
|
|
2017-03-18 04:17:59 +07:00
|
|
|
return sprctl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
ivb_update_plane(struct intel_plane *plane,
|
2017-03-18 04:17:59 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-24 02:27:09 +07:00
|
|
|
u32 sprctl = plane_state->ctl, sprscale = 0;
|
2017-03-24 02:27:12 +07:00
|
|
|
u32 sprsurf_offset = plane_state->main.offset;
|
|
|
|
u32 linear_offset;
|
2017-03-18 04:17:59 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
|
|
|
int crtc_x = plane_state->base.dst.x1;
|
|
|
|
int crtc_y = plane_state->base.dst.y1;
|
|
|
|
uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);
|
|
|
|
uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);
|
2017-03-24 02:27:12 +07:00
|
|
|
uint32_t x = plane_state->main.x;
|
|
|
|
uint32_t y = plane_state->main.y;
|
2017-03-18 04:17:59 +07:00
|
|
|
uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;
|
|
|
|
uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
2011-12-14 04:19:38 +07:00
|
|
|
/* Sizes are 0 based */
|
|
|
|
src_w--;
|
|
|
|
src_h--;
|
|
|
|
crtc_w--;
|
|
|
|
crtc_h--;
|
|
|
|
|
2013-12-05 20:51:39 +07:00
|
|
|
if (crtc_w != src_w || crtc_h != src_h)
|
2011-12-14 04:19:38 +07:00
|
|
|
sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h;
|
|
|
|
|
2016-01-20 23:02:50 +07:00
|
|
|
linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);
|
drm/i915: Rewrite fb rotation GTT handling
Redo the fb rotation handling in order to:
- eliminate the NV12 special casing
- handle fb->offsets[] properly
- make the rotation handling easier for the plane code
To achieve these goals we reduce intel_rotation_info to only contain
(for each plane) the rotated view width,height,stride in tile units,
and the page offset into the object where the plane starts. Each plane
is handled exactly the same way, no special casing for NV12 or other
formats. We then store the computed rotation_info under
intel_framebuffer so that we don't have to recompute it again.
To handle fb->offsets[] we treat them as a linear offsets and convert
them to x/y offsets from the start of the relevant GTT mapping (either
normal or rotated). We store the x/y offsets under intel_framebuffer,
and for some extra convenience we also store the rotated pitch (ie.
tile aligned plane height). So for each plane we have the normal
x/y offsets, rotated x/y offsets, and the rotated pitch. The normal
pitch is available already in fb->pitches[].
While we're gathering up all that extra information, we can also easily
compute the storage requirements for the framebuffer, so that we can
check that the object is big enough to hold it.
When it comes time to deal with the plane source coordinates, we first
rotate the clipped src coordinates to match the relevant GTT view
orientation, then add to them the fb x/y offsets. Next we compute
the aligned surface page offset, and as a result we're left with some
residual x/y offsets. Finally, if required by the hardware, we convert
the remaining x/y offsets into a linear offset.
For gen2/3 we simply skip computing the final page offset, and just
convert the src+fb x/y offsets directly into a linear offset since
that's what the hardware wants.
After this all platforms, incluing SKL+, compute these things in exactly
the same way (excluding alignemnt differences).
v2: Use BIT(DRM_ROTATE_270) instead of ROTATE_270 when rotating
plane src coordinates
Drop some spurious changes that got left behind during
development
v3: Split out more changes to prep patches (Daniel)
s/intel_fb->plane[].foo.bar/intel_fb->foo[].bar/ for brevity
Rename intel_surf_gtt_offset to intel_fb_gtt_offset
Kill the pointless 'plane' parameter from intel_fb_gtt_offset()
v4: Fix alignment vs. alignment-1 when calling
_intel_compute_tile_offset() from intel_fill_fb_info()
Pass the pitch in tiles in
stad of pixels to intel_adjust_tile_offset() from intel_fill_fb_info()
Pass the full width/height of the rotated area to
drm_rect_rotate() for clarity
Use u32 for more offsets
v5: Preserve the upper_32_bits()/lower_32_bits() handling for the
fb ggtt offset (Sivakumar)
v6: Rebase due to drm_plane_state src/dst rects
Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-2-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-09-15 17:16:41 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
2015-03-20 02:18:57 +07:00
|
|
|
if (key->flags) {
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRKEYVAL(pipe), key->min_value);
|
|
|
|
I915_WRITE_FW(SPRKEYMAX(pipe), key->max_value);
|
|
|
|
I915_WRITE_FW(SPRKEYMSK(pipe), key->channel_mask);
|
2015-03-20 02:18:57 +07:00
|
|
|
}
|
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRSTRIDE(pipe), fb->pitches[0]);
|
|
|
|
I915_WRITE_FW(SPRPOS(pipe), (crtc_y << 16) | crtc_x);
|
2014-01-18 01:09:03 +07:00
|
|
|
|
2012-10-27 00:20:12 +07:00
|
|
|
/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET
|
|
|
|
* register */
|
2016-10-13 17:03:00 +07:00
|
|
|
if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPROFFSET(pipe), (y << 16) | x);
|
2016-11-16 18:33:16 +07:00
|
|
|
else if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRTILEOFF(pipe), (y << 16) | x);
|
2012-10-27 00:20:12 +07:00
|
|
|
else
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRLINOFF(pipe), linear_offset);
|
2012-10-27 00:20:11 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRSIZE(pipe), (crtc_h << 16) | crtc_w);
|
2017-03-28 01:55:33 +07:00
|
|
|
if (plane->can_scale)
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRSCALE(pipe), sprscale);
|
|
|
|
I915_WRITE_FW(SPRCTL(pipe), sprctl);
|
|
|
|
I915_WRITE_FW(SPRSURF(pipe),
|
|
|
|
intel_plane_ggtt_offset(plane_state) + sprsurf_offset);
|
|
|
|
POSTING_READ_FW(SPRSURF(pipe));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
ivb_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-09 22:44:33 +07:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRCTL(pipe), 0);
|
2011-12-14 04:19:38 +07:00
|
|
|
/* Can't leave the scaler enabled... */
|
2017-03-28 01:55:33 +07:00
|
|
|
if (plane->can_scale)
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRSCALE(pipe), 0);
|
2014-04-29 17:35:47 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(SPRSURF(pipe), 0);
|
|
|
|
POSTING_READ_FW(SPRSURF(pipe));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
2017-11-18 02:19:08 +07:00
|
|
|
static bool
|
2018-01-31 03:38:03 +07:00
|
|
|
ivb_plane_get_hw_state(struct intel_plane *plane,
|
|
|
|
enum pipe *pipe)
|
2017-11-18 02:19:08 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum intel_display_power_domain power_domain;
|
|
|
|
bool ret;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
power_domain = POWER_DOMAIN_PIPE(plane->pipe);
|
2017-11-18 02:19:08 +07:00
|
|
|
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
|
|
|
|
return false;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
ret = I915_READ(SPRCTL(plane->pipe)) & SPRITE_ENABLE;
|
|
|
|
|
|
|
|
*pipe = plane->pipe;
|
2017-11-18 02:19:08 +07:00
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, power_domain);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-04-22 01:14:32 +07:00
|
|
|
static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,
|
2017-03-18 04:18:00 +07:00
|
|
|
const struct intel_plane_state *plane_state)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2017-03-18 04:18:00 +07:00
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
to_i915(plane_state->base.plane->dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
2016-02-16 03:54:41 +07:00
|
|
|
unsigned int rotation = plane_state->base.rotation;
|
2016-01-07 17:54:06 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
2017-03-18 04:18:00 +07:00
|
|
|
u32 dvscntr;
|
|
|
|
|
|
|
|
dvscntr = DVS_ENABLE | DVS_GAMMA_ENABLE;
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2017-03-18 04:18:00 +07:00
|
|
|
if (IS_GEN6(dev_priv))
|
|
|
|
dvscntr |= DVS_TRICKLE_FEED_DISABLE;
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2016-12-15 04:32:55 +07:00
|
|
|
switch (fb->format->format) {
|
2011-12-14 04:19:38 +07:00
|
|
|
case DRM_FORMAT_XBGR8888:
|
2012-02-28 03:40:10 +07:00
|
|
|
dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;
|
2011-12-14 04:19:38 +07:00
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
2012-02-28 03:40:10 +07:00
|
|
|
dvscntr |= DVS_FORMAT_RGBX888;
|
2011-12-14 04:19:38 +07:00
|
|
|
break;
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YUYV;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YVYU;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_UYVY;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_VYUY;
|
|
|
|
break;
|
|
|
|
default:
|
2017-03-18 04:18:00 +07:00
|
|
|
MISSING_CASE(fb->format->format);
|
|
|
|
return 0;
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
2018-02-15 02:23:25 +07:00
|
|
|
if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
|
|
|
|
dvscntr |= DVS_YUV_FORMAT_BT709;
|
|
|
|
|
2018-02-15 02:23:27 +07:00
|
|
|
if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
|
|
|
|
dvscntr |= DVS_YUV_RANGE_CORRECTION_DISABLE;
|
|
|
|
|
2016-11-16 18:33:16 +07:00
|
|
|
if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2011-12-14 04:19:38 +07:00
|
|
|
dvscntr |= DVS_TILED;
|
|
|
|
|
2017-05-20 03:50:17 +07:00
|
|
|
if (rotation & DRM_MODE_ROTATE_180)
|
2016-11-14 23:53:59 +07:00
|
|
|
dvscntr |= DVS_ROTATE_180;
|
|
|
|
|
2017-03-09 22:44:32 +07:00
|
|
|
if (key->flags & I915_SET_COLORKEY_DESTINATION)
|
|
|
|
dvscntr |= DVS_DEST_KEY;
|
|
|
|
else if (key->flags & I915_SET_COLORKEY_SOURCE)
|
|
|
|
dvscntr |= DVS_SOURCE_KEY;
|
|
|
|
|
2017-03-18 04:18:00 +07:00
|
|
|
return dvscntr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
g4x_update_plane(struct intel_plane *plane,
|
2017-03-18 04:18:00 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct intel_plane_state *plane_state)
|
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
const struct drm_framebuffer *fb = plane_state->base.fb;
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-24 02:27:12 +07:00
|
|
|
u32 dvscntr = plane_state->ctl, dvsscale = 0;
|
|
|
|
u32 dvssurf_offset = plane_state->main.offset;
|
|
|
|
u32 linear_offset;
|
2017-03-18 04:18:00 +07:00
|
|
|
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
|
|
|
int crtc_x = plane_state->base.dst.x1;
|
|
|
|
int crtc_y = plane_state->base.dst.y1;
|
|
|
|
uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);
|
|
|
|
uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);
|
2017-03-24 02:27:12 +07:00
|
|
|
uint32_t x = plane_state->main.x;
|
|
|
|
uint32_t y = plane_state->main.y;
|
2017-03-18 04:18:00 +07:00
|
|
|
uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;
|
|
|
|
uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
2011-12-14 04:19:38 +07:00
|
|
|
/* Sizes are 0 based */
|
|
|
|
src_w--;
|
|
|
|
src_h--;
|
|
|
|
crtc_w--;
|
|
|
|
crtc_h--;
|
|
|
|
|
2013-12-05 20:51:31 +07:00
|
|
|
if (crtc_w != src_w || crtc_h != src_h)
|
2011-12-14 04:19:38 +07:00
|
|
|
dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h;
|
|
|
|
|
2016-01-20 23:02:50 +07:00
|
|
|
linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);
|
drm/i915: Rewrite fb rotation GTT handling
Redo the fb rotation handling in order to:
- eliminate the NV12 special casing
- handle fb->offsets[] properly
- make the rotation handling easier for the plane code
To achieve these goals we reduce intel_rotation_info to only contain
(for each plane) the rotated view width,height,stride in tile units,
and the page offset into the object where the plane starts. Each plane
is handled exactly the same way, no special casing for NV12 or other
formats. We then store the computed rotation_info under
intel_framebuffer so that we don't have to recompute it again.
To handle fb->offsets[] we treat them as a linear offsets and convert
them to x/y offsets from the start of the relevant GTT mapping (either
normal or rotated). We store the x/y offsets under intel_framebuffer,
and for some extra convenience we also store the rotated pitch (ie.
tile aligned plane height). So for each plane we have the normal
x/y offsets, rotated x/y offsets, and the rotated pitch. The normal
pitch is available already in fb->pitches[].
While we're gathering up all that extra information, we can also easily
compute the storage requirements for the framebuffer, so that we can
check that the object is big enough to hold it.
When it comes time to deal with the plane source coordinates, we first
rotate the clipped src coordinates to match the relevant GTT view
orientation, then add to them the fb x/y offsets. Next we compute
the aligned surface page offset, and as a result we're left with some
residual x/y offsets. Finally, if required by the hardware, we convert
the remaining x/y offsets into a linear offset.
For gen2/3 we simply skip computing the final page offset, and just
convert the src+fb x/y offsets directly into a linear offset since
that's what the hardware wants.
After this all platforms, incluing SKL+, compute these things in exactly
the same way (excluding alignemnt differences).
v2: Use BIT(DRM_ROTATE_270) instead of ROTATE_270 when rotating
plane src coordinates
Drop some spurious changes that got left behind during
development
v3: Split out more changes to prep patches (Daniel)
s/intel_fb->plane[].foo.bar/intel_fb->foo[].bar/ for brevity
Rename intel_surf_gtt_offset to intel_fb_gtt_offset
Kill the pointless 'plane' parameter from intel_fb_gtt_offset()
v4: Fix alignment vs. alignment-1 when calling
_intel_compute_tile_offset() from intel_fill_fb_info()
Pass the pitch in tiles in
stad of pixels to intel_adjust_tile_offset() from intel_fill_fb_info()
Pass the full width/height of the rotated area to
drm_rect_rotate() for clarity
Use u32 for more offsets
v5: Preserve the upper_32_bits()/lower_32_bits() handling for the
fb ggtt offset (Sivakumar)
v6: Rebase due to drm_plane_state src/dst rects
Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-2-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-09-15 17:16:41 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
2015-03-20 02:18:57 +07:00
|
|
|
if (key->flags) {
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(DVSKEYVAL(pipe), key->min_value);
|
|
|
|
I915_WRITE_FW(DVSKEYMAX(pipe), key->max_value);
|
|
|
|
I915_WRITE_FW(DVSKEYMSK(pipe), key->channel_mask);
|
2015-03-20 02:18:57 +07:00
|
|
|
}
|
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(DVSSTRIDE(pipe), fb->pitches[0]);
|
|
|
|
I915_WRITE_FW(DVSPOS(pipe), (crtc_y << 16) | crtc_x);
|
2014-01-18 01:09:03 +07:00
|
|
|
|
2016-11-16 18:33:16 +07:00
|
|
|
if (fb->modifier == I915_FORMAT_MOD_X_TILED)
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(DVSTILEOFF(pipe), (y << 16) | x);
|
2012-10-27 00:20:12 +07:00
|
|
|
else
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(DVSLINOFF(pipe), linear_offset);
|
|
|
|
|
|
|
|
I915_WRITE_FW(DVSSIZE(pipe), (crtc_h << 16) | crtc_w);
|
|
|
|
I915_WRITE_FW(DVSSCALE(pipe), dvsscale);
|
|
|
|
I915_WRITE_FW(DVSCNTR(pipe), dvscntr);
|
|
|
|
I915_WRITE_FW(DVSSURF(pipe),
|
|
|
|
intel_plane_ggtt_offset(plane_state) + dvssurf_offset);
|
|
|
|
POSTING_READ_FW(DVSSURF(pipe));
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-03-28 01:55:33 +07:00
|
|
|
g4x_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum pipe pipe = plane->pipe;
|
2017-03-09 22:44:33 +07:00
|
|
|
unsigned long irqflags;
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
|
|
|
I915_WRITE_FW(DVSCNTR(pipe), 0);
|
2011-12-14 04:19:38 +07:00
|
|
|
/* Disable the scaler */
|
2017-03-09 22:44:33 +07:00
|
|
|
I915_WRITE_FW(DVSSCALE(pipe), 0);
|
|
|
|
|
|
|
|
I915_WRITE_FW(DVSSURF(pipe), 0);
|
|
|
|
POSTING_READ_FW(DVSSURF(pipe));
|
2015-03-19 22:57:13 +07:00
|
|
|
|
2017-03-09 22:44:33 +07:00
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
2017-11-18 02:19:08 +07:00
|
|
|
static bool
|
2018-01-31 03:38:03 +07:00
|
|
|
g4x_plane_get_hw_state(struct intel_plane *plane,
|
|
|
|
enum pipe *pipe)
|
2017-11-18 02:19:08 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
enum intel_display_power_domain power_domain;
|
|
|
|
bool ret;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
power_domain = POWER_DOMAIN_PIPE(plane->pipe);
|
2017-11-18 02:19:08 +07:00
|
|
|
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
|
|
|
|
return false;
|
|
|
|
|
2018-01-31 03:38:03 +07:00
|
|
|
ret = I915_READ(DVSCNTR(plane->pipe)) & DVS_ENABLE;
|
|
|
|
|
|
|
|
*pipe = plane->pipe;
|
2017-11-18 02:19:08 +07:00
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, power_domain);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-12-14 04:19:38 +07:00
|
|
|
static int
|
2017-03-28 01:55:33 +07:00
|
|
|
intel_check_sprite_plane(struct intel_plane *plane,
|
2015-06-15 17:33:46 +07:00
|
|
|
struct intel_crtc_state *crtc_state,
|
2014-09-06 03:04:47 +07:00
|
|
|
struct intel_plane_state *state)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2017-03-28 01:55:33 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
|
2014-12-02 06:40:13 +07:00
|
|
|
struct drm_framebuffer *fb = state->base.fb;
|
2017-12-23 02:22:29 +07:00
|
|
|
int max_stride = INTEL_GEN(dev_priv) >= 9 ? 32768 : 16384;
|
2013-04-24 22:52:38 +07:00
|
|
|
int max_scale, min_scale;
|
2015-05-19 06:18:44 +07:00
|
|
|
bool can_scale;
|
2016-01-28 21:53:54 +07:00
|
|
|
int ret;
|
2018-04-09 10:41:13 +07:00
|
|
|
uint32_t pixel_format = 0;
|
2014-12-05 01:27:42 +07:00
|
|
|
|
|
|
|
if (!fb) {
|
2016-07-26 23:06:59 +07:00
|
|
|
state->base.visible = false;
|
2015-06-15 17:33:44 +07:00
|
|
|
return 0;
|
2014-12-05 01:27:42 +07:00
|
|
|
}
|
2013-03-26 23:25:43 +07:00
|
|
|
|
2013-04-24 22:52:38 +07:00
|
|
|
/* Don't modify another pipe's plane */
|
2017-03-28 01:55:33 +07:00
|
|
|
if (plane->pipe != crtc->pipe) {
|
2013-04-24 22:52:38 +07:00
|
|
|
DRM_DEBUG_KMS("Wrong plane <-> crtc mapping\n");
|
2011-12-14 04:19:38 +07:00
|
|
|
return -EINVAL;
|
2013-04-24 22:52:38 +07:00
|
|
|
}
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2013-04-24 22:52:38 +07:00
|
|
|
/* FIXME check all gen limits */
|
2017-12-23 02:22:29 +07:00
|
|
|
if (fb->width < 3 || fb->height < 3 || fb->pitches[0] > max_stride) {
|
2013-04-24 22:52:38 +07:00
|
|
|
DRM_DEBUG_KMS("Unsuitable framebuffer for plane\n");
|
2011-12-14 04:19:38 +07:00
|
|
|
return -EINVAL;
|
2013-04-24 22:52:38 +07:00
|
|
|
}
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2015-05-19 06:18:44 +07:00
|
|
|
/* setup can_scale, min_scale, max_scale */
|
2016-10-14 15:17:22 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9) {
|
2018-04-09 10:41:13 +07:00
|
|
|
if (state->base.fb)
|
|
|
|
pixel_format = state->base.fb->format->format;
|
2015-05-19 06:18:44 +07:00
|
|
|
/* use scaler when colorkey is not required */
|
2018-02-03 03:42:31 +07:00
|
|
|
if (!state->ckey.flags) {
|
2015-05-19 06:18:44 +07:00
|
|
|
can_scale = 1;
|
|
|
|
min_scale = 1;
|
2018-04-09 10:41:13 +07:00
|
|
|
max_scale =
|
|
|
|
skl_max_scale(crtc, crtc_state, pixel_format);
|
2015-05-19 06:18:44 +07:00
|
|
|
} else {
|
|
|
|
can_scale = 0;
|
|
|
|
min_scale = DRM_PLANE_HELPER_NO_SCALING;
|
|
|
|
max_scale = DRM_PLANE_HELPER_NO_SCALING;
|
|
|
|
}
|
|
|
|
} else {
|
2017-03-28 01:55:33 +07:00
|
|
|
can_scale = plane->can_scale;
|
|
|
|
max_scale = plane->max_downscale << 16;
|
|
|
|
min_scale = plane->can_scale ? 1 : (1 << 16);
|
2015-05-19 06:18:44 +07:00
|
|
|
}
|
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
ret = drm_atomic_helper_check_plane_state(&state->base,
|
|
|
|
&crtc_state->base,
|
|
|
|
min_scale, max_scale,
|
|
|
|
true, true);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2012-10-23 00:19:27 +07:00
|
|
|
|
2016-07-26 23:06:59 +07:00
|
|
|
if (state->base.visible) {
|
2018-05-03 18:22:15 +07:00
|
|
|
struct drm_rect *src = &state->base.src;
|
|
|
|
struct drm_rect *dst = &state->base.dst;
|
|
|
|
unsigned int crtc_w = drm_rect_width(dst);
|
|
|
|
unsigned int crtc_h = drm_rect_height(dst);
|
|
|
|
uint32_t src_x, src_y, src_w, src_h;
|
2013-04-24 22:52:38 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Hardware doesn't handle subpixel coordinates.
|
|
|
|
* Adjust to (macro)pixel boundary, but be careful not to
|
|
|
|
* increase the source viewport size, because that could
|
|
|
|
* push the downscaling factor out of bounds.
|
|
|
|
*/
|
2014-09-06 03:04:47 +07:00
|
|
|
src_x = src->x1 >> 16;
|
|
|
|
src_w = drm_rect_width(src) >> 16;
|
|
|
|
src_y = src->y1 >> 16;
|
|
|
|
src_h = drm_rect_height(src) >> 16;
|
2013-04-24 22:52:38 +07:00
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
src->x1 = src_x << 16;
|
|
|
|
src->x2 = (src_x + src_w) << 16;
|
|
|
|
src->y1 = src_y << 16;
|
|
|
|
src->y2 = (src_y + src_h) << 16;
|
2013-04-24 22:52:38 +07:00
|
|
|
|
2018-07-18 00:13:43 +07:00
|
|
|
if (fb->format->is_yuv &&
|
Last drm/i915 changes for v4.18:
- NV12 enabling (Chandra, Maarten)
- ICL workarounds (Oscar)
- ICL basic DPLL enabling (Paulo)
- GVT updates
- DP link config refactoring (Jani)
- Module parameter to override DMC firmware (Jani)
- PSR updates (José, DK, Daniel, Ville)
- ICL DP vswing programming (Manasi)
- ICL DBuf slice updates (Mahesh)
- Selftest fixes and updates (Chris, Matthew, Oscar)
- Execlist fixes and updates (Chris)
- Stolen memory first 4k fix (Hans de Goede)
- wait_for fixes (Mika)
- Tons of GEM improvements (Chris)
- Plenty of other fixes and improvements (Everyone)
- Crappy changelog (Me)
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEFWWmW3ewYy4RJOWc05gHnSar7m8FAlr5iVgACgkQ05gHnSar
7m9SxxAAs7x+rnjvQmKcksl8tmO7LIQWQOdEI8xJdYpwl0BkErwjofNFUktRPOVD
ONjMkJIkxr5Xp44IM9kuV5B2czXMYldOe/PRDC9RhQhflmqzwsp4UlXw09LCWNk4
oQuhNfcUlle9m6WORZWJMWhSQHdmNKSsH0c8iuu3Qk886OEOAKwm9PeFx1MOvAff
wCg7BCwMM5CUfLEa9s1BbbXunKGDxIEwi7N9nb6eMCPE+1nCLZdnsdo0M+VMkJ4h
YkHyYXDo6V6JebdMHdqVKHw0vPewUilag5DiVx6F8IP2ttLq4MRSKAcyKDDJbCPr
rtPNorDSSnDYUCwIxOdYGHjlL0rqeDhU20LKzJKdWQ8IaDjCUKqdby497cThIDFp
s50K+MKoxPfipOpJAl2YqXJqETfidmfkh+FgMpcDhh9I7b9mZu5LYKd+5SjCcuBI
Hnm++rS1+o09H99Bks5ho5aSU62r0LGAPmqZtKC4wyBnjmUaZXMVa6B+qCgC+McR
O4/J9uDkFn6ApuEs7xPN3cSIEpeFSDtxAVLJohSiMN9eBXqggMPiLY9kwQFP3uB4
cC08lh/2yf6oRN8KmtexInsTMTmTHDNQuWfL9Eri55UjHcblZ1cxdmVTGGQurHS0
KWAhB/M69y6FqfUpcUJJFzO63NPu6Ai1Owl5CW+1Pf2c214dseE=
=/43Z
-----END PGP SIGNATURE-----
Merge tag 'drm-intel-next-2018-05-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Last drm/i915 changes for v4.18:
- NV12 enabling (Chandra, Maarten)
- ICL workarounds (Oscar)
- ICL basic DPLL enabling (Paulo)
- GVT updates
- DP link config refactoring (Jani)
- Module parameter to override DMC firmware (Jani)
- PSR updates (José, DK, Daniel, Ville)
- ICL DP vswing programming (Manasi)
- ICL DBuf slice updates (Mahesh)
- Selftest fixes and updates (Chris, Matthew, Oscar)
- Execlist fixes and updates (Chris)
- Stolen memory first 4k fix (Hans de Goede)
- wait_for fixes (Mika)
- Tons of GEM improvements (Chris)
- Plenty of other fixes and improvements (Everyone)
- Crappy changelog (Me)
Signed-off-by: Dave Airlie <airlied@redhat.com>
# gpg: Signature made Mon 14 May 2018 11:04:24 PM AEST
# gpg: using RSA key D398079D26ABEE6F
# gpg: Good signature from "Jani Nikula <jani.nikula@intel.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1565 A65B 77B0 632E 1124 E59C D398 079D 26AB EE6F
# Conflicts:
# drivers/gpu/drm/i915/intel_lrc.c
# drivers/gpu/drm/i915/intel_sprite.c
Link: https://patchwork.freedesktop.org/patch/msgid/87k1s51bvw.fsf@intel.com
2018-05-16 04:10:13 +07:00
|
|
|
fb->format->format != DRM_FORMAT_NV12 &&
|
2018-05-03 18:22:15 +07:00
|
|
|
(src_x % 2 || src_w % 2)) {
|
|
|
|
DRM_DEBUG_KMS("src x/w (%u, %u) must be a multiple of 2 for YUV planes\n",
|
|
|
|
src_x, src_w);
|
|
|
|
return -EINVAL;
|
2013-04-24 22:52:38 +07:00
|
|
|
}
|
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
/* Check size restrictions when scaling */
|
|
|
|
if (src_w != crtc_w || src_h != crtc_h) {
|
|
|
|
unsigned int width_bytes;
|
|
|
|
int cpp = fb->format->cpp[0];
|
2013-04-24 22:52:38 +07:00
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
WARN_ON(!can_scale);
|
2013-04-24 22:52:38 +07:00
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
width_bytes = ((src_x * cpp) & 63) + src_w * cpp;
|
2013-04-24 22:52:38 +07:00
|
|
|
|
2018-05-03 18:22:15 +07:00
|
|
|
/* FIXME interlacing min height is 6 */
|
|
|
|
if (INTEL_GEN(dev_priv) < 9 && (
|
|
|
|
src_w < 3 || src_h < 3 ||
|
|
|
|
src_w > 2048 || src_h > 2048 ||
|
|
|
|
crtc_w < 3 || crtc_h < 3 ||
|
|
|
|
width_bytes > 4096 || fb->pitches[0] > 4096)) {
|
|
|
|
DRM_DEBUG_KMS("Source dimensions exceed hardware limits\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2013-04-24 22:52:38 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-14 15:17:22 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9) {
|
2018-01-16 18:24:14 +07:00
|
|
|
ret = skl_check_plane_surface(crtc_state, state);
|
2016-01-28 21:53:54 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2017-03-24 02:27:09 +07:00
|
|
|
|
|
|
|
state->ctl = skl_plane_ctl(crtc_state, state);
|
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2017-03-24 02:27:12 +07:00
|
|
|
ret = i9xx_check_plane_surface(state);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2017-03-24 02:27:09 +07:00
|
|
|
state->ctl = vlv_sprite_ctl(crtc_state, state);
|
|
|
|
} else if (INTEL_GEN(dev_priv) >= 7) {
|
2017-03-24 02:27:12 +07:00
|
|
|
ret = i9xx_check_plane_surface(state);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2017-03-24 02:27:09 +07:00
|
|
|
state->ctl = ivb_sprite_ctl(crtc_state, state);
|
|
|
|
} else {
|
2017-03-24 02:27:12 +07:00
|
|
|
ret = i9xx_check_plane_surface(state);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2017-04-22 01:14:32 +07:00
|
|
|
state->ctl = g4x_sprite_ctl(crtc_state, state);
|
2016-01-28 21:53:54 +07:00
|
|
|
}
|
|
|
|
|
2017-11-14 01:11:28 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
|
|
|
|
state->color_ctl = glk_plane_color_ctl(crtc_state, state);
|
|
|
|
|
2014-09-06 03:04:47 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-05-30 01:28:00 +07:00
|
|
|
static bool has_dst_key_in_primary_plane(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
return INTEL_GEN(dev_priv) >= 9;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void intel_plane_set_ckey(struct intel_plane_state *plane_state,
|
|
|
|
const struct drm_intel_sprite_colorkey *set)
|
|
|
|
{
|
|
|
|
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
|
struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
|
|
|
|
|
|
|
|
*key = *set;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We want src key enabled on the
|
|
|
|
* sprite and not on the primary.
|
|
|
|
*/
|
|
|
|
if (plane->id == PLANE_PRIMARY &&
|
|
|
|
set->flags & I915_SET_COLORKEY_SOURCE)
|
|
|
|
key->flags = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On SKL+ we want dst key enabled on
|
|
|
|
* the primary and not on the sprite.
|
|
|
|
*/
|
|
|
|
if (INTEL_GEN(dev_priv) >= 9 && plane->id != PLANE_PRIMARY &&
|
|
|
|
set->flags & I915_SET_COLORKEY_DESTINATION)
|
|
|
|
key->flags = 0;
|
|
|
|
}
|
|
|
|
|
2018-02-07 23:48:41 +07:00
|
|
|
int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
2012-01-03 23:05:39 +07:00
|
|
|
{
|
2016-10-14 16:13:44 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-01-03 23:05:39 +07:00
|
|
|
struct drm_intel_sprite_colorkey *set = data;
|
|
|
|
struct drm_plane *plane;
|
2015-06-15 17:33:54 +07:00
|
|
|
struct drm_plane_state *plane_state;
|
|
|
|
struct drm_atomic_state *state;
|
|
|
|
struct drm_modeset_acquire_ctx ctx;
|
2012-01-03 23:05:39 +07:00
|
|
|
int ret = 0;
|
|
|
|
|
2018-02-03 03:42:31 +07:00
|
|
|
/* ignore the pointless "none" flag */
|
|
|
|
set->flags &= ~I915_SET_COLORKEY_NONE;
|
|
|
|
|
2018-02-07 03:43:33 +07:00
|
|
|
if (set->flags & ~(I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-01-03 23:05:39 +07:00
|
|
|
/* Make sure we don't try to enable both src & dest simultaneously */
|
|
|
|
if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2016-10-14 16:13:44 +07:00
|
|
|
if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
|
2015-03-20 02:18:57 +07:00
|
|
|
set->flags & I915_SET_COLORKEY_DESTINATION)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-03-15 13:25:07 +07:00
|
|
|
plane = drm_plane_find(dev, file_priv, set->plane_id);
|
2015-06-15 17:33:54 +07:00
|
|
|
if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY)
|
|
|
|
return -ENOENT;
|
2012-01-03 23:05:39 +07:00
|
|
|
|
2018-05-30 01:28:00 +07:00
|
|
|
/*
|
|
|
|
* SKL+ only plane 2 can do destination keying against plane 1.
|
|
|
|
* Also multiple planes can't do destination keying on the same
|
|
|
|
* pipe simultaneously.
|
|
|
|
*/
|
|
|
|
if (INTEL_GEN(dev_priv) >= 9 &&
|
|
|
|
to_intel_plane(plane)->id >= PLANE_SPRITE1 &&
|
|
|
|
set->flags & I915_SET_COLORKEY_DESTINATION)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2015-06-15 17:33:54 +07:00
|
|
|
drm_modeset_acquire_init(&ctx, 0);
|
2015-04-28 03:48:39 +07:00
|
|
|
|
2015-06-15 17:33:54 +07:00
|
|
|
state = drm_atomic_state_alloc(plane->dev);
|
|
|
|
if (!state) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
2015-04-28 03:48:39 +07:00
|
|
|
}
|
2015-06-15 17:33:54 +07:00
|
|
|
state->acquire_ctx = &ctx;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
plane_state = drm_atomic_get_plane_state(state, plane);
|
|
|
|
ret = PTR_ERR_OR_ZERO(plane_state);
|
2018-05-30 01:28:00 +07:00
|
|
|
if (!ret)
|
|
|
|
intel_plane_set_ckey(to_intel_plane_state(plane_state), set);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On some platforms we have to configure
|
|
|
|
* the dst colorkey on the primary plane.
|
|
|
|
*/
|
|
|
|
if (!ret && has_dst_key_in_primary_plane(dev_priv)) {
|
|
|
|
struct intel_crtc *crtc =
|
|
|
|
intel_get_crtc_for_pipe(dev_priv,
|
|
|
|
to_intel_plane(plane)->pipe);
|
|
|
|
|
|
|
|
plane_state = drm_atomic_get_plane_state(state,
|
|
|
|
crtc->base.primary);
|
|
|
|
ret = PTR_ERR_OR_ZERO(plane_state);
|
|
|
|
if (!ret)
|
|
|
|
intel_plane_set_ckey(to_intel_plane_state(plane_state), set);
|
2015-06-15 17:33:54 +07:00
|
|
|
}
|
2015-04-28 03:48:39 +07:00
|
|
|
|
2018-05-30 01:28:00 +07:00
|
|
|
if (!ret)
|
|
|
|
ret = drm_atomic_commit(state);
|
|
|
|
|
2015-06-15 17:33:54 +07:00
|
|
|
if (ret != -EDEADLK)
|
|
|
|
break;
|
2012-01-03 23:05:39 +07:00
|
|
|
|
2015-06-15 17:33:54 +07:00
|
|
|
drm_atomic_state_clear(state);
|
|
|
|
drm_modeset_backoff(&ctx);
|
|
|
|
}
|
2012-01-03 23:05:39 +07:00
|
|
|
|
2016-10-14 19:18:18 +07:00
|
|
|
drm_atomic_state_put(state);
|
2015-06-15 17:33:54 +07:00
|
|
|
out:
|
|
|
|
drm_modeset_drop_locks(&ctx);
|
|
|
|
drm_modeset_acquire_fini(&ctx);
|
|
|
|
return ret;
|
2013-03-26 23:25:43 +07:00
|
|
|
}
|
|
|
|
|
2017-04-22 01:14:32 +07:00
|
|
|
static const uint32_t g4x_plane_formats[] = {
|
2012-04-10 17:41:49 +07:00
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_YVYU,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_VYUY,
|
|
|
|
};
|
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
static const uint64_t i9xx_plane_format_modifiers[] = {
|
|
|
|
I915_FORMAT_MOD_X_TILED,
|
|
|
|
DRM_FORMAT_MOD_LINEAR,
|
|
|
|
DRM_FORMAT_MOD_INVALID
|
|
|
|
};
|
|
|
|
|
2015-05-12 22:13:22 +07:00
|
|
|
static const uint32_t snb_plane_formats[] = {
|
2011-12-14 04:19:38 +07:00
|
|
|
DRM_FORMAT_XBGR8888,
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_YVYU,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_VYUY,
|
|
|
|
};
|
|
|
|
|
2015-05-12 22:13:22 +07:00
|
|
|
static const uint32_t vlv_plane_formats[] = {
|
2013-04-03 01:22:20 +07:00
|
|
|
DRM_FORMAT_RGB565,
|
|
|
|
DRM_FORMAT_ABGR8888,
|
|
|
|
DRM_FORMAT_ARGB8888,
|
|
|
|
DRM_FORMAT_XBGR8888,
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_XBGR2101010,
|
|
|
|
DRM_FORMAT_ABGR2101010,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_YVYU,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_VYUY,
|
|
|
|
};
|
|
|
|
|
2013-12-04 07:49:41 +07:00
|
|
|
static uint32_t skl_plane_formats[] = {
|
|
|
|
DRM_FORMAT_RGB565,
|
|
|
|
DRM_FORMAT_ABGR8888,
|
|
|
|
DRM_FORMAT_ARGB8888,
|
|
|
|
DRM_FORMAT_XBGR8888,
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_YVYU,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_VYUY,
|
|
|
|
};
|
|
|
|
|
2018-05-12 04:33:17 +07:00
|
|
|
static uint32_t skl_planar_formats[] = {
|
|
|
|
DRM_FORMAT_RGB565,
|
|
|
|
DRM_FORMAT_ABGR8888,
|
|
|
|
DRM_FORMAT_ARGB8888,
|
|
|
|
DRM_FORMAT_XBGR8888,
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_YVYU,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_VYUY,
|
|
|
|
DRM_FORMAT_NV12,
|
|
|
|
};
|
|
|
|
|
2017-12-23 02:22:28 +07:00
|
|
|
static const uint64_t skl_plane_format_modifiers_noccs[] = {
|
|
|
|
I915_FORMAT_MOD_Yf_TILED,
|
|
|
|
I915_FORMAT_MOD_Y_TILED,
|
|
|
|
I915_FORMAT_MOD_X_TILED,
|
|
|
|
DRM_FORMAT_MOD_LINEAR,
|
|
|
|
DRM_FORMAT_MOD_INVALID
|
|
|
|
};
|
|
|
|
|
|
|
|
static const uint64_t skl_plane_format_modifiers_ccs[] = {
|
|
|
|
I915_FORMAT_MOD_Yf_TILED_CCS,
|
|
|
|
I915_FORMAT_MOD_Y_TILED_CCS,
|
2017-12-23 02:22:26 +07:00
|
|
|
I915_FORMAT_MOD_Yf_TILED,
|
|
|
|
I915_FORMAT_MOD_Y_TILED,
|
2017-08-01 23:58:16 +07:00
|
|
|
I915_FORMAT_MOD_X_TILED,
|
|
|
|
DRM_FORMAT_MOD_LINEAR,
|
|
|
|
DRM_FORMAT_MOD_INVALID
|
|
|
|
};
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
|
|
|
|
u32 format, u64 modifier)
|
2017-08-01 23:58:16 +07:00
|
|
|
{
|
2018-05-18 23:21:59 +07:00
|
|
|
switch (modifier) {
|
|
|
|
case DRM_FORMAT_MOD_LINEAR:
|
|
|
|
case I915_FORMAT_MOD_X_TILED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
if (modifier == DRM_FORMAT_MOD_LINEAR ||
|
|
|
|
modifier == I915_FORMAT_MOD_X_TILED)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static bool snb_sprite_format_mod_supported(struct drm_plane *_plane,
|
|
|
|
u32 format, u64 modifier)
|
2017-08-01 23:58:16 +07:00
|
|
|
{
|
2018-05-18 23:21:59 +07:00
|
|
|
switch (modifier) {
|
|
|
|
case DRM_FORMAT_MOD_LINEAR:
|
|
|
|
case I915_FORMAT_MOD_X_TILED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
switch (format) {
|
2017-12-23 02:22:27 +07:00
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_XBGR8888:
|
2017-08-01 23:58:16 +07:00
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
2017-12-23 02:22:27 +07:00
|
|
|
if (modifier == DRM_FORMAT_MOD_LINEAR ||
|
|
|
|
modifier == I915_FORMAT_MOD_X_TILED)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static bool vlv_sprite_format_mod_supported(struct drm_plane *_plane,
|
|
|
|
u32 format, u64 modifier)
|
2017-12-23 02:22:27 +07:00
|
|
|
{
|
2018-05-18 23:21:59 +07:00
|
|
|
switch (modifier) {
|
|
|
|
case DRM_FORMAT_MOD_LINEAR:
|
|
|
|
case I915_FORMAT_MOD_X_TILED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-12-23 02:22:27 +07:00
|
|
|
switch (format) {
|
2017-08-01 23:58:16 +07:00
|
|
|
case DRM_FORMAT_RGB565:
|
2017-12-23 02:22:27 +07:00
|
|
|
case DRM_FORMAT_ABGR8888:
|
2017-08-01 23:58:16 +07:00
|
|
|
case DRM_FORMAT_ARGB8888:
|
2017-12-23 02:22:27 +07:00
|
|
|
case DRM_FORMAT_XBGR8888:
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
2017-08-01 23:58:16 +07:00
|
|
|
case DRM_FORMAT_XBGR2101010:
|
|
|
|
case DRM_FORMAT_ABGR2101010:
|
2017-12-23 02:22:27 +07:00
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
2017-08-01 23:58:16 +07:00
|
|
|
if (modifier == DRM_FORMAT_MOD_LINEAR ||
|
|
|
|
modifier == I915_FORMAT_MOD_X_TILED)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
|
|
|
|
u32 format, u64 modifier)
|
2017-08-01 23:58:16 +07:00
|
|
|
{
|
2018-05-18 23:21:59 +07:00
|
|
|
struct intel_plane *plane = to_intel_plane(_plane);
|
|
|
|
|
|
|
|
switch (modifier) {
|
|
|
|
case DRM_FORMAT_MOD_LINEAR:
|
|
|
|
case I915_FORMAT_MOD_X_TILED:
|
|
|
|
case I915_FORMAT_MOD_Y_TILED:
|
|
|
|
case I915_FORMAT_MOD_Yf_TILED:
|
|
|
|
break;
|
|
|
|
case I915_FORMAT_MOD_Y_TILED_CCS:
|
|
|
|
case I915_FORMAT_MOD_Yf_TILED_CCS:
|
|
|
|
if (!plane->has_ccs)
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_XBGR8888:
|
|
|
|
case DRM_FORMAT_ARGB8888:
|
|
|
|
case DRM_FORMAT_ABGR8888:
|
2017-12-23 02:22:28 +07:00
|
|
|
if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
|
|
|
|
modifier == I915_FORMAT_MOD_Y_TILED_CCS)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
2017-08-01 23:58:16 +07:00
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
case DRM_FORMAT_XRGB2101010:
|
|
|
|
case DRM_FORMAT_XBGR2101010:
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
2018-05-12 04:33:17 +07:00
|
|
|
case DRM_FORMAT_NV12:
|
2017-08-01 23:58:16 +07:00
|
|
|
if (modifier == I915_FORMAT_MOD_Yf_TILED)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
|
|
|
case DRM_FORMAT_C8:
|
|
|
|
if (modifier == DRM_FORMAT_MOD_LINEAR ||
|
|
|
|
modifier == I915_FORMAT_MOD_X_TILED ||
|
|
|
|
modifier == I915_FORMAT_MOD_Y_TILED)
|
|
|
|
return true;
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static const struct drm_plane_funcs g4x_sprite_funcs = {
|
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = intel_plane_destroy,
|
|
|
|
.atomic_get_property = intel_plane_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_plane_atomic_set_property,
|
|
|
|
.atomic_duplicate_state = intel_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = intel_plane_destroy_state,
|
|
|
|
.format_mod_supported = g4x_sprite_format_mod_supported,
|
|
|
|
};
|
2017-08-01 23:58:16 +07:00
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static const struct drm_plane_funcs snb_sprite_funcs = {
|
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = intel_plane_destroy,
|
|
|
|
.atomic_get_property = intel_plane_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_plane_atomic_set_property,
|
|
|
|
.atomic_duplicate_state = intel_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = intel_plane_destroy_state,
|
|
|
|
.format_mod_supported = snb_sprite_format_mod_supported,
|
|
|
|
};
|
2017-08-01 23:58:16 +07:00
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static const struct drm_plane_funcs vlv_sprite_funcs = {
|
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = intel_plane_destroy,
|
|
|
|
.atomic_get_property = intel_plane_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_plane_atomic_set_property,
|
|
|
|
.atomic_duplicate_state = intel_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = intel_plane_destroy_state,
|
|
|
|
.format_mod_supported = vlv_sprite_format_mod_supported,
|
|
|
|
};
|
2017-08-01 23:58:16 +07:00
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
static const struct drm_plane_funcs skl_plane_funcs = {
|
2018-05-30 23:59:22 +07:00
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = intel_plane_destroy,
|
|
|
|
.atomic_get_property = intel_plane_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_plane_atomic_set_property,
|
|
|
|
.atomic_duplicate_state = intel_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = intel_plane_destroy_state,
|
2018-05-18 23:21:59 +07:00
|
|
|
.format_mod_supported = skl_plane_format_mod_supported,
|
2017-08-01 23:58:16 +07:00
|
|
|
};
|
|
|
|
|
2017-12-23 02:22:28 +07:00
|
|
|
bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe, enum plane_id plane_id)
|
|
|
|
{
|
|
|
|
if (plane_id == PLANE_CURSOR)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 10)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (IS_GEMINILAKE(dev_priv))
|
|
|
|
return pipe != PIPE_C;
|
|
|
|
|
|
|
|
return pipe != PIPE_C &&
|
|
|
|
(plane_id == PLANE_PRIMARY ||
|
|
|
|
plane_id == PLANE_SPRITE0);
|
|
|
|
}
|
|
|
|
|
2016-10-25 22:58:02 +07:00
|
|
|
struct intel_plane *
|
2016-11-01 03:37:00 +07:00
|
|
|
intel_sprite_plane_create(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe, int plane)
|
2011-12-14 04:19:38 +07:00
|
|
|
{
|
2016-03-21 21:43:22 +07:00
|
|
|
struct intel_plane *intel_plane = NULL;
|
|
|
|
struct intel_plane_state *state = NULL;
|
2018-05-18 23:21:59 +07:00
|
|
|
const struct drm_plane_funcs *plane_funcs;
|
2011-12-14 04:19:38 +07:00
|
|
|
unsigned long possible_crtcs;
|
2012-04-10 17:41:49 +07:00
|
|
|
const uint32_t *plane_formats;
|
2017-08-01 23:58:16 +07:00
|
|
|
const uint64_t *modifiers;
|
2016-09-26 23:30:56 +07:00
|
|
|
unsigned int supported_rotations;
|
2012-04-10 17:41:49 +07:00
|
|
|
int num_plane_formats;
|
2011-12-14 04:19:38 +07:00
|
|
|
int ret;
|
|
|
|
|
2013-09-19 17:18:32 +07:00
|
|
|
intel_plane = kzalloc(sizeof(*intel_plane), GFP_KERNEL);
|
2016-03-21 21:43:22 +07:00
|
|
|
if (!intel_plane) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto fail;
|
|
|
|
}
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2015-01-22 07:35:41 +07:00
|
|
|
state = intel_create_plane_state(&intel_plane->base);
|
|
|
|
if (!state) {
|
2016-03-21 21:43:22 +07:00
|
|
|
ret = -ENOMEM;
|
|
|
|
goto fail;
|
2014-12-24 01:41:52 +07:00
|
|
|
}
|
2015-01-22 07:35:41 +07:00
|
|
|
intel_plane->base.state = &state->base;
|
2014-12-24 01:41:52 +07:00
|
|
|
|
2017-12-23 02:22:28 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9) {
|
2017-08-01 23:58:16 +07:00
|
|
|
intel_plane->can_scale = true;
|
|
|
|
state->scaler_id = -1;
|
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe,
|
|
|
|
PLANE_SPRITE0 + plane);
|
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
intel_plane->update_plane = skl_update_plane;
|
|
|
|
intel_plane->disable_plane = skl_disable_plane;
|
2017-11-18 02:19:08 +07:00
|
|
|
intel_plane->get_hw_state = skl_plane_get_hw_state;
|
2017-08-01 23:58:16 +07:00
|
|
|
|
2018-05-12 04:33:17 +07:00
|
|
|
if (skl_plane_has_planar(dev_priv, pipe,
|
|
|
|
PLANE_SPRITE0 + plane)) {
|
|
|
|
plane_formats = skl_planar_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(skl_planar_formats);
|
|
|
|
} else {
|
|
|
|
plane_formats = skl_plane_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(skl_plane_formats);
|
|
|
|
}
|
2012-04-10 17:41:49 +07:00
|
|
|
|
2018-05-18 23:21:59 +07:00
|
|
|
if (intel_plane->has_ccs)
|
2017-12-23 02:22:28 +07:00
|
|
|
modifiers = skl_plane_format_modifiers_ccs;
|
|
|
|
else
|
|
|
|
modifiers = skl_plane_format_modifiers_noccs;
|
2018-05-18 23:21:59 +07:00
|
|
|
|
|
|
|
plane_funcs = &skl_plane_funcs;
|
2016-10-25 22:58:03 +07:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
|
|
|
intel_plane->can_scale = false;
|
|
|
|
intel_plane->max_downscale = 1;
|
|
|
|
|
|
|
|
intel_plane->update_plane = vlv_update_plane;
|
|
|
|
intel_plane->disable_plane = vlv_disable_plane;
|
2017-11-18 02:19:08 +07:00
|
|
|
intel_plane->get_hw_state = vlv_plane_get_hw_state;
|
2012-04-10 17:41:49 +07:00
|
|
|
|
2016-10-25 22:58:03 +07:00
|
|
|
plane_formats = vlv_plane_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(vlv_plane_formats);
|
2017-08-01 23:58:16 +07:00
|
|
|
modifiers = i9xx_plane_format_modifiers;
|
2018-05-18 23:21:59 +07:00
|
|
|
|
|
|
|
plane_funcs = &vlv_sprite_funcs;
|
2016-10-25 22:58:03 +07:00
|
|
|
} else if (INTEL_GEN(dev_priv) >= 7) {
|
2016-10-14 16:13:44 +07:00
|
|
|
if (IS_IVYBRIDGE(dev_priv)) {
|
2012-10-23 00:19:27 +07:00
|
|
|
intel_plane->can_scale = true;
|
2013-04-25 21:15:00 +07:00
|
|
|
intel_plane->max_downscale = 2;
|
|
|
|
} else {
|
|
|
|
intel_plane->can_scale = false;
|
|
|
|
intel_plane->max_downscale = 1;
|
|
|
|
}
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2016-10-25 22:58:03 +07:00
|
|
|
intel_plane->update_plane = ivb_update_plane;
|
|
|
|
intel_plane->disable_plane = ivb_disable_plane;
|
2017-11-18 02:19:08 +07:00
|
|
|
intel_plane->get_hw_state = ivb_plane_get_hw_state;
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2016-10-25 22:58:03 +07:00
|
|
|
plane_formats = snb_plane_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(snb_plane_formats);
|
2017-08-01 23:58:16 +07:00
|
|
|
modifiers = i9xx_plane_format_modifiers;
|
2018-05-18 23:21:59 +07:00
|
|
|
|
|
|
|
plane_funcs = &snb_sprite_funcs;
|
2016-10-25 22:58:03 +07:00
|
|
|
} else {
|
|
|
|
intel_plane->can_scale = true;
|
|
|
|
intel_plane->max_downscale = 16;
|
|
|
|
|
2017-04-22 01:14:32 +07:00
|
|
|
intel_plane->update_plane = g4x_update_plane;
|
|
|
|
intel_plane->disable_plane = g4x_disable_plane;
|
2017-11-18 02:19:08 +07:00
|
|
|
intel_plane->get_hw_state = g4x_plane_get_hw_state;
|
2013-04-03 01:22:20 +07:00
|
|
|
|
2017-08-01 23:58:16 +07:00
|
|
|
modifiers = i9xx_plane_format_modifiers;
|
2016-10-25 22:58:03 +07:00
|
|
|
if (IS_GEN6(dev_priv)) {
|
2013-04-03 01:22:20 +07:00
|
|
|
plane_formats = snb_plane_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(snb_plane_formats);
|
2018-05-18 23:21:59 +07:00
|
|
|
|
|
|
|
plane_funcs = &snb_sprite_funcs;
|
2016-10-25 22:58:03 +07:00
|
|
|
} else {
|
2017-04-22 01:14:32 +07:00
|
|
|
plane_formats = g4x_plane_formats;
|
|
|
|
num_plane_formats = ARRAY_SIZE(g4x_plane_formats);
|
2018-05-18 23:21:59 +07:00
|
|
|
|
|
|
|
plane_funcs = &g4x_sprite_funcs;
|
2013-04-03 01:22:20 +07:00
|
|
|
}
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|
|
|
|
|
2016-10-25 13:36:13 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9) {
|
2016-09-26 23:30:56 +07:00
|
|
|
supported_rotations =
|
2017-05-20 03:50:17 +07:00
|
|
|
DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
|
|
|
|
DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
|
2016-11-14 23:54:00 +07:00
|
|
|
} else if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B) {
|
|
|
|
supported_rotations =
|
2017-05-20 03:50:17 +07:00
|
|
|
DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180 |
|
|
|
|
DRM_MODE_REFLECT_X;
|
2016-09-26 23:30:56 +07:00
|
|
|
} else {
|
|
|
|
supported_rotations =
|
2017-05-20 03:50:17 +07:00
|
|
|
DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180;
|
2016-09-26 23:30:56 +07:00
|
|
|
}
|
|
|
|
|
2011-12-14 04:19:38 +07:00
|
|
|
intel_plane->pipe = pipe;
|
2017-11-18 02:19:10 +07:00
|
|
|
intel_plane->i9xx_plane = plane;
|
2016-11-22 23:01:56 +07:00
|
|
|
intel_plane->id = PLANE_SPRITE0 + plane;
|
2018-01-24 01:33:43 +07:00
|
|
|
intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, intel_plane->id);
|
2014-12-02 06:40:16 +07:00
|
|
|
intel_plane->check_plane = intel_check_sprite_plane;
|
2016-03-21 21:43:22 +07:00
|
|
|
|
2011-12-14 04:19:38 +07:00
|
|
|
possible_crtcs = (1 << pipe);
|
2016-03-21 21:43:22 +07:00
|
|
|
|
2016-10-25 22:58:03 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9)
|
2016-11-01 03:37:00 +07:00
|
|
|
ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
|
2018-05-18 23:21:59 +07:00
|
|
|
possible_crtcs, plane_funcs,
|
2016-05-28 00:59:23 +07:00
|
|
|
plane_formats, num_plane_formats,
|
2017-08-01 23:58:16 +07:00
|
|
|
modifiers,
|
|
|
|
DRM_PLANE_TYPE_OVERLAY,
|
2016-05-28 00:59:23 +07:00
|
|
|
"plane %d%c", plane + 2, pipe_name(pipe));
|
|
|
|
else
|
2016-11-01 03:37:00 +07:00
|
|
|
ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
|
2018-05-18 23:21:59 +07:00
|
|
|
possible_crtcs, plane_funcs,
|
2016-05-28 00:59:23 +07:00
|
|
|
plane_formats, num_plane_formats,
|
2017-08-01 23:58:16 +07:00
|
|
|
modifiers,
|
|
|
|
DRM_PLANE_TYPE_OVERLAY,
|
2016-05-28 00:59:23 +07:00
|
|
|
"sprite %c", sprite_name(pipe, plane));
|
2016-03-21 21:43:22 +07:00
|
|
|
if (ret)
|
|
|
|
goto fail;
|
2014-08-05 12:56:55 +07:00
|
|
|
|
2016-09-26 23:30:56 +07:00
|
|
|
drm_plane_create_rotation_property(&intel_plane->base,
|
2017-05-20 03:50:17 +07:00
|
|
|
DRM_MODE_ROTATE_0,
|
2016-09-26 23:30:56 +07:00
|
|
|
supported_rotations);
|
2011-12-14 04:19:38 +07:00
|
|
|
|
2018-02-15 02:23:25 +07:00
|
|
|
drm_plane_create_color_properties(&intel_plane->base,
|
|
|
|
BIT(DRM_COLOR_YCBCR_BT601) |
|
|
|
|
BIT(DRM_COLOR_YCBCR_BT709),
|
2018-02-15 02:23:27 +07:00
|
|
|
BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
|
|
|
|
BIT(DRM_COLOR_YCBCR_FULL_RANGE),
|
2018-02-15 02:23:26 +07:00
|
|
|
DRM_COLOR_YCBCR_BT709,
|
2018-02-15 02:23:25 +07:00
|
|
|
DRM_COLOR_YCBCR_LIMITED_RANGE);
|
|
|
|
|
2014-12-24 01:41:52 +07:00
|
|
|
drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
|
|
|
|
|
2016-10-25 22:58:02 +07:00
|
|
|
return intel_plane;
|
2016-03-21 21:43:22 +07:00
|
|
|
|
|
|
|
fail:
|
|
|
|
kfree(state);
|
|
|
|
kfree(intel_plane);
|
|
|
|
|
2016-10-25 22:58:02 +07:00
|
|
|
return ERR_PTR(ret);
|
2011-12-14 04:19:38 +07:00
|
|
|
}
|