2013-08-27 19:12:20 +07:00
|
|
|
/*
|
|
|
|
* Copyright © 2013 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.
|
|
|
|
*
|
|
|
|
* Author: Jani Nikula <jani.nikula@intel.com>
|
|
|
|
*/
|
|
|
|
|
2019-04-05 18:00:06 +07:00
|
|
|
#include <linux/slab.h>
|
|
|
|
|
2015-01-23 07:50:32 +07:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2013-08-27 19:12:20 +07:00
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_edid.h>
|
2015-01-16 19:27:23 +07:00
|
|
|
#include <drm/drm_mipi_dsi.h>
|
2019-04-05 18:00:06 +07:00
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
#include "i915_drv.h"
|
2019-04-29 19:53:31 +07:00
|
|
|
#include "intel_atomic.h"
|
2019-04-05 18:00:06 +07:00
|
|
|
#include "intel_connector.h"
|
2019-08-06 18:39:33 +07:00
|
|
|
#include "intel_display_types.h"
|
2013-08-27 19:12:20 +07:00
|
|
|
#include "intel_dsi.h"
|
2019-04-29 19:29:24 +07:00
|
|
|
#include "intel_fifo_underrun.h"
|
2019-04-05 18:00:14 +07:00
|
|
|
#include "intel_panel.h"
|
2019-04-26 15:17:22 +07:00
|
|
|
#include "intel_sideband.h"
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-04-19 15:18:14 +07:00
|
|
|
/* return pixels in terms of txbyteclkhs */
|
|
|
|
static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count,
|
|
|
|
u16 burst_mode_ratio)
|
|
|
|
{
|
|
|
|
return DIV_ROUND_UP(DIV_ROUND_UP(pixels * bpp * burst_mode_ratio,
|
|
|
|
8 * 100), lane_count);
|
|
|
|
}
|
|
|
|
|
2016-04-19 15:18:13 +07:00
|
|
|
/* return pixels equvalent to txbyteclkhs */
|
|
|
|
static u16 pixels_from_txbyteclkhs(u16 clk_hs, int bpp, int lane_count,
|
|
|
|
u16 burst_mode_ratio)
|
|
|
|
{
|
|
|
|
return DIV_ROUND_UP((clk_hs * lane_count * 8 * 100),
|
|
|
|
(bpp * burst_mode_ratio));
|
|
|
|
}
|
|
|
|
|
2016-04-07 16:06:06 +07:00
|
|
|
enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt)
|
|
|
|
{
|
|
|
|
/* It just so happens the VBT matches register contents. */
|
|
|
|
switch (fmt) {
|
|
|
|
case VID_MODE_FORMAT_RGB888:
|
|
|
|
return MIPI_DSI_FMT_RGB888;
|
|
|
|
case VID_MODE_FORMAT_RGB666:
|
|
|
|
return MIPI_DSI_FMT_RGB666;
|
|
|
|
case VID_MODE_FORMAT_RGB666_PACKED:
|
|
|
|
return MIPI_DSI_FMT_RGB666_PACKED;
|
|
|
|
case VID_MODE_FORMAT_RGB565:
|
|
|
|
return MIPI_DSI_FMT_RGB565;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(fmt);
|
|
|
|
return MIPI_DSI_FMT_RGB666;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
void vlv_dsi_wait_for_fifo_empty(struct intel_dsi *intel_dsi, enum port port)
|
2015-01-16 19:27:18 +07:00
|
|
|
{
|
|
|
|
struct drm_encoder *encoder = &intel_dsi->base.base;
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-01-16 19:27:18 +07:00
|
|
|
u32 mask;
|
|
|
|
|
|
|
|
mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
|
|
|
|
LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;
|
|
|
|
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_GEN_FIFO_STAT(port),
|
|
|
|
mask, 100))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "DPI FIFOs are not empty\n");
|
2015-01-16 19:27:18 +07:00
|
|
|
}
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
static void write_data(struct drm_i915_private *dev_priv,
|
|
|
|
i915_reg_t reg,
|
2015-01-16 19:27:23 +07:00
|
|
|
const u8 *data, u32 len)
|
|
|
|
{
|
|
|
|
u32 i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
|
|
|
u32 val = 0;
|
|
|
|
|
|
|
|
for (j = 0; j < min_t(u32, len - i, 4); j++)
|
|
|
|
val |= *data++ << 8 * j;
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
2015-01-16 19:27:23 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
static void read_data(struct drm_i915_private *dev_priv,
|
|
|
|
i915_reg_t reg,
|
2015-01-16 19:27:23 +07:00
|
|
|
u8 *data, u32 len)
|
|
|
|
{
|
|
|
|
u32 i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
2015-01-16 19:27:23 +07:00
|
|
|
|
|
|
|
for (j = 0; j < min_t(u32, len - i, 4); j++)
|
|
|
|
*data++ = val >> 8 * j;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
|
|
|
|
const struct mipi_dsi_msg *msg)
|
|
|
|
{
|
|
|
|
struct intel_dsi_host *intel_dsi_host = to_intel_dsi_host(host);
|
|
|
|
struct drm_device *dev = intel_dsi_host->intel_dsi->base.base.dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-01-16 19:27:23 +07:00
|
|
|
enum port port = intel_dsi_host->port;
|
|
|
|
struct mipi_dsi_packet packet;
|
|
|
|
ssize_t ret;
|
|
|
|
const u8 *header, *data;
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
i915_reg_t data_reg, ctrl_reg;
|
|
|
|
u32 data_mask, ctrl_mask;
|
2015-01-16 19:27:23 +07:00
|
|
|
|
|
|
|
ret = mipi_dsi_create_packet(&packet, msg);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
header = packet.header;
|
|
|
|
data = packet.payload;
|
|
|
|
|
|
|
|
if (msg->flags & MIPI_DSI_MSG_USE_LPM) {
|
|
|
|
data_reg = MIPI_LP_GEN_DATA(port);
|
|
|
|
data_mask = LP_DATA_FIFO_FULL;
|
|
|
|
ctrl_reg = MIPI_LP_GEN_CTRL(port);
|
|
|
|
ctrl_mask = LP_CTRL_FIFO_FULL;
|
|
|
|
} else {
|
|
|
|
data_reg = MIPI_HS_GEN_DATA(port);
|
|
|
|
data_mask = HS_DATA_FIFO_FULL;
|
|
|
|
ctrl_reg = MIPI_HS_GEN_CTRL(port);
|
|
|
|
ctrl_mask = HS_CTRL_FIFO_FULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* note: this is never true for reads */
|
|
|
|
if (packet.payload_length) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_GEN_FIFO_STAT(port),
|
|
|
|
data_mask, 50))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Timeout waiting for HS/LP DATA FIFO !full\n");
|
2015-01-16 19:27:23 +07:00
|
|
|
|
|
|
|
write_data(dev_priv, data_reg, packet.payload,
|
|
|
|
packet.payload_length);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (msg->rx_len) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_INTR_STAT(port),
|
|
|
|
GEN_READ_DATA_AVAIL);
|
2015-01-16 19:27:23 +07:00
|
|
|
}
|
|
|
|
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_GEN_FIFO_STAT(port),
|
|
|
|
ctrl_mask, 50)) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Timeout waiting for HS/LP CTRL FIFO !full\n");
|
2015-01-16 19:27:23 +07:00
|
|
|
}
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, ctrl_reg,
|
|
|
|
header[2] << 16 | header[1] << 8 | header[0]);
|
2015-01-16 19:27:23 +07:00
|
|
|
|
|
|
|
/* ->rx_len is set only for reads */
|
|
|
|
if (msg->rx_len) {
|
|
|
|
data_mask = GEN_READ_DATA_AVAIL;
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_INTR_STAT(port),
|
|
|
|
data_mask, 50))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Timeout waiting for read data.\n");
|
2015-01-16 19:27:23 +07:00
|
|
|
|
|
|
|
read_data(dev_priv, data_reg, msg->rx_buf, msg->rx_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX: fix for reads and writes */
|
|
|
|
return 4 + packet.payload_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int intel_dsi_host_attach(struct mipi_dsi_host *host,
|
|
|
|
struct mipi_dsi_device *dsi)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int intel_dsi_host_detach(struct mipi_dsi_host *host,
|
|
|
|
struct mipi_dsi_device *dsi)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct mipi_dsi_host_ops intel_dsi_host_ops = {
|
|
|
|
.attach = intel_dsi_host_attach,
|
|
|
|
.detach = intel_dsi_host_detach,
|
|
|
|
.transfer = intel_dsi_host_transfer,
|
|
|
|
};
|
|
|
|
|
2015-01-16 19:27:26 +07:00
|
|
|
/*
|
|
|
|
* send a video mode command
|
|
|
|
*
|
|
|
|
* XXX: commands with data in MIPI_DPI_DATA?
|
|
|
|
*/
|
|
|
|
static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs,
|
|
|
|
enum port port)
|
|
|
|
{
|
|
|
|
struct drm_encoder *encoder = &intel_dsi->base.base;
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-01-16 19:27:26 +07:00
|
|
|
u32 mask;
|
|
|
|
|
|
|
|
/* XXX: pipe, hs */
|
|
|
|
if (hs)
|
|
|
|
cmd &= ~DPI_LP_MODE;
|
|
|
|
else
|
|
|
|
cmd |= DPI_LP_MODE;
|
|
|
|
|
|
|
|
/* clear bit */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT);
|
2015-01-16 19:27:26 +07:00
|
|
|
|
|
|
|
/* XXX: old code skips write if control unchanged */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
if (cmd == intel_de_read(dev_priv, MIPI_DPI_CONTROL(port)))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Same special packet %02x twice in a row.\n", cmd);
|
2015-01-16 19:27:26 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DPI_CONTROL(port), cmd);
|
2015-01-16 19:27:26 +07:00
|
|
|
|
|
|
|
mask = SPL_PKT_SENT_INTERRUPT;
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_INTR_STAT(port), mask, 100))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Video mode command 0x%08x send failed.\n", cmd);
|
2015-01-16 19:27:26 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-10 13:44:55 +07:00
|
|
|
static void band_gap_reset(struct drm_i915_private *dev_priv)
|
2013-08-27 19:12:24 +07:00
|
|
|
{
|
2019-04-26 15:17:19 +07:00
|
|
|
vlv_flisdsi_get(dev_priv);
|
2013-08-27 19:12:24 +07:00
|
|
|
|
2013-12-10 13:44:55 +07:00
|
|
|
vlv_flisdsi_write(dev_priv, 0x08, 0x0001);
|
|
|
|
vlv_flisdsi_write(dev_priv, 0x0F, 0x0005);
|
|
|
|
vlv_flisdsi_write(dev_priv, 0x0F, 0x0025);
|
|
|
|
udelay(150);
|
|
|
|
vlv_flisdsi_write(dev_priv, 0x0F, 0x0000);
|
|
|
|
vlv_flisdsi_write(dev_priv, 0x08, 0x0000);
|
2013-08-27 19:12:24 +07:00
|
|
|
|
2019-04-26 15:17:19 +07:00
|
|
|
vlv_flisdsi_put(dev_priv);
|
2013-08-27 19:12:24 +07:00
|
|
|
}
|
|
|
|
|
2019-01-16 03:08:00 +07:00
|
|
|
static int intel_dsi_compute_config(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *pipe_config,
|
|
|
|
struct drm_connector_state *conn_state)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2013-08-27 19:12:20 +07:00
|
|
|
struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
|
|
|
|
base);
|
|
|
|
struct intel_connector *intel_connector = intel_dsi->attached_connector;
|
2016-04-13 02:14:37 +07:00
|
|
|
const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
|
2019-10-31 18:26:02 +07:00
|
|
|
struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
|
2016-04-13 02:14:35 +07:00
|
|
|
int ret;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2018-10-12 13:23:07 +07:00
|
|
|
pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-04-13 02:14:37 +07:00
|
|
|
if (fixed_mode) {
|
2013-08-27 19:12:20 +07:00
|
|
|
intel_fixed_panel_mode(fixed_mode, adjusted_mode);
|
|
|
|
|
2019-02-05 05:25:38 +07:00
|
|
|
if (HAS_GMCH(dev_priv))
|
2020-04-22 23:19:17 +07:00
|
|
|
ret = intel_gmch_panel_fitting(pipe_config, conn_state);
|
2016-04-13 02:14:37 +07:00
|
|
|
else
|
2020-04-22 23:19:17 +07:00
|
|
|
ret = intel_pch_panel_fitting(pipe_config, conn_state);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2016-04-13 02:14:37 +07:00
|
|
|
}
|
|
|
|
|
2018-05-24 19:54:03 +07:00
|
|
|
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
|
2019-01-16 03:08:00 +07:00
|
|
|
return -EINVAL;
|
2018-05-24 19:54:03 +07:00
|
|
|
|
2014-07-30 22:02:37 +07:00
|
|
|
/* DSI uses short packets for sync events, so clear mode flags for DSI */
|
|
|
|
adjusted_mode->flags = 0;
|
|
|
|
|
2018-12-01 18:31:45 +07:00
|
|
|
if (intel_dsi->pixel_format == MIPI_DSI_FMT_RGB888)
|
|
|
|
pipe_config->pipe_bpp = 24;
|
|
|
|
else
|
|
|
|
pipe_config->pipe_bpp = 18;
|
|
|
|
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
2017-09-25 20:56:01 +07:00
|
|
|
/* Enable Frame time stamp based scanline reporting */
|
|
|
|
adjusted_mode->private_flags |=
|
|
|
|
I915_MODE_FLAG_GET_SCANLINE_FROM_TIMESTAMP;
|
|
|
|
|
2016-03-18 22:05:42 +07:00
|
|
|
/* Dual link goes to DSI transcoder A. */
|
|
|
|
if (intel_dsi->ports == BIT(PORT_C))
|
|
|
|
pipe_config->cpu_transcoder = TRANSCODER_DSI_C;
|
|
|
|
else
|
|
|
|
pipe_config->cpu_transcoder = TRANSCODER_DSI_A;
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
ret = bxt_dsi_pll_compute(encoder, pipe_config);
|
|
|
|
if (ret)
|
2019-01-16 03:08:00 +07:00
|
|
|
return -EINVAL;
|
2018-07-05 20:25:08 +07:00
|
|
|
} else {
|
|
|
|
ret = vlv_dsi_pll_compute(encoder, pipe_config);
|
|
|
|
if (ret)
|
2019-01-16 03:08:00 +07:00
|
|
|
return -EINVAL;
|
2018-07-05 20:25:08 +07:00
|
|
|
}
|
2016-04-13 02:14:35 +07:00
|
|
|
|
2016-04-13 02:14:34 +07:00
|
|
|
pipe_config->clock_set = true;
|
|
|
|
|
2019-01-16 03:08:00 +07:00
|
|
|
return 0;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
static bool glk_dsi_enable_io(struct intel_encoder *encoder)
|
2017-03-01 14:21:33 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-03-01 14:21:33 +07:00
|
|
|
enum port port;
|
2017-06-13 14:48:14 +07:00
|
|
|
u32 tmp;
|
2017-06-13 14:48:15 +07:00
|
|
|
bool cold_boot = false;
|
2017-03-01 14:21:33 +07:00
|
|
|
|
|
|
|
/* Set the MIPI mode
|
|
|
|
* If MIPI_Mode is off, then writing to LP_Wake bit is not reflecting.
|
|
|
|
* Power ON MIPI IO first and then write into IO reset and LP wake bits
|
|
|
|
*/
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port),
|
|
|
|
tmp | GLK_MIPIIO_ENABLE);
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Put the IO into reset */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(PORT_A));
|
2017-03-01 14:21:33 +07:00
|
|
|
tmp &= ~GLK_MIPIIO_RESET_RELEASED;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(PORT_A), tmp);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
|
|
|
/* Program LP Wake */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
|
|
|
if (!(intel_de_read(dev_priv, MIPI_DEVICE_READY(port)) & DEVICE_READY))
|
2017-06-13 14:48:15 +07:00
|
|
|
tmp &= ~GLK_LP_WAKE;
|
|
|
|
else
|
|
|
|
tmp |= GLK_LP_WAKE;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port), tmp);
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for Pwr ACK */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_MIPIIO_PORT_POWERED, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "MIPIO port is powergated\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
2017-06-13 14:48:15 +07:00
|
|
|
|
|
|
|
/* Check for cold boot scenario */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-03-26 04:49:39 +07:00
|
|
|
cold_boot |=
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
!(intel_de_read(dev_priv, MIPI_DEVICE_READY(port)) & DEVICE_READY);
|
2017-06-13 14:48:15 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return cold_boot;
|
2017-06-13 14:48:14 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void glk_dsi_device_ready(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-06-13 14:48:14 +07:00
|
|
|
enum port port;
|
|
|
|
u32 val;
|
2017-03-01 14:21:33 +07:00
|
|
|
|
|
|
|
/* Wait for MIPI PHY status bit to set */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_PHY_STATUS_PORT_READY, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "PHY is not ON\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get IO out of reset */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_CTRL(PORT_A));
|
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(PORT_A),
|
|
|
|
val | GLK_MIPIIO_RESET_RELEASED);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
|
|
|
/* Get IO out of Low power state*/
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
if (!(intel_de_read(dev_priv, MIPI_DEVICE_READY(port)) & DEVICE_READY)) {
|
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2017-03-01 14:21:33 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
|
|
|
val |= DEVICE_READY;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-03-01 14:21:33 +07:00
|
|
|
usleep_range(10, 15);
|
2017-06-13 14:48:15 +07:00
|
|
|
} else {
|
|
|
|
/* Enter ULPS */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2017-06-13 14:48:15 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
|
|
|
val |= (ULPS_STATE_ENTER | DEVICE_READY);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
/* Wait for ULPS active */
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_ULPS_NOT_ACTIVE, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "ULPS not active\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
/* Exit ULPS */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2017-06-13 14:48:15 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
|
|
|
val |= (ULPS_STATE_EXIT | DEVICE_READY);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
/* Enter Normal Mode */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2017-06-13 14:48:15 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
|
|
|
val |= (ULPS_STATE_NORMAL_OPERATION | DEVICE_READY);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_CTRL(port));
|
2017-06-13 14:48:15 +07:00
|
|
|
val &= ~GLK_LP_WAKE;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port), val);
|
2017-06-13 14:48:15 +07:00
|
|
|
}
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for Stop state */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_DATA_LANE_STOP_STATE, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Date lane not in STOP state\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for AFE LATCH */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, BXT_MIPI_PORT_CTRL(port),
|
|
|
|
AFE_LATCHOUT, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"D-PHY not entering LP-11 state\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-01 21:11:42 +07:00
|
|
|
static void bxt_dsi_device_ready(struct intel_encoder *encoder)
|
2014-12-04 12:28:47 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2014-12-05 15:39:28 +07:00
|
|
|
enum port port;
|
2015-09-01 21:11:42 +07:00
|
|
|
u32 val;
|
2014-12-04 12:28:47 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2014-12-05 15:43:41 +07:00
|
|
|
|
2017-02-08 17:50:54 +07:00
|
|
|
/* Enable MIPI PHY transparent latch */
|
2014-12-05 15:39:28 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, BXT_MIPI_PORT_CTRL(port));
|
|
|
|
intel_de_write(dev_priv, BXT_MIPI_PORT_CTRL(port),
|
|
|
|
val | LP_OUTPUT_HOLD);
|
2015-09-01 21:11:42 +07:00
|
|
|
usleep_range(2000, 2500);
|
2017-02-08 17:50:54 +07:00
|
|
|
}
|
2015-09-01 21:11:42 +07:00
|
|
|
|
2017-02-08 17:50:54 +07:00
|
|
|
/* Clear ULPS and set device ready */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2015-09-01 21:11:42 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-02-08 17:50:54 +07:00
|
|
|
usleep_range(2000, 2500);
|
2015-09-01 21:11:42 +07:00
|
|
|
val |= DEVICE_READY;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2014-12-05 15:39:28 +07:00
|
|
|
}
|
2014-12-04 12:28:47 +07:00
|
|
|
}
|
|
|
|
|
2015-09-01 21:11:42 +07:00
|
|
|
static void vlv_dsi_device_ready(struct intel_encoder *encoder)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2014-12-05 15:54:21 +07:00
|
|
|
enum port port;
|
2013-12-11 19:22:05 +07:00
|
|
|
u32 val;
|
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2019-04-26 15:17:19 +07:00
|
|
|
vlv_flisdsi_get(dev_priv);
|
2014-04-09 15:29:30 +07:00
|
|
|
/* program rcomp for compliance, reduce from 50 ohms to 45 ohms
|
|
|
|
* needed everytime after power gate */
|
|
|
|
vlv_flisdsi_write(dev_priv, 0x04, 0x0004);
|
2019-04-26 15:17:19 +07:00
|
|
|
vlv_flisdsi_put(dev_priv);
|
2014-04-09 15:29:30 +07:00
|
|
|
|
|
|
|
/* bandgap reset is needed after everytime we do power gate */
|
|
|
|
band_gap_reset(dev_priv);
|
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2014-07-03 18:05:41 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
ULPS_STATE_ENTER);
|
2014-12-05 15:54:21 +07:00
|
|
|
usleep_range(2500, 3000);
|
2014-07-03 18:05:41 +07:00
|
|
|
|
2014-12-07 17:43:54 +07:00
|
|
|
/* Enable MIPI PHY transparent latch
|
|
|
|
* Common bit for both MIPI Port A & MIPI Port C
|
|
|
|
* No similar bit in MIPI Port C reg
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_PORT_CTRL(PORT_A));
|
|
|
|
intel_de_write(dev_priv, MIPI_PORT_CTRL(PORT_A),
|
|
|
|
val | LP_OUTPUT_HOLD);
|
2014-12-05 15:54:21 +07:00
|
|
|
usleep_range(1000, 1500);
|
2014-07-03 18:05:41 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
ULPS_STATE_EXIT);
|
2014-12-05 15:54:21 +07:00
|
|
|
usleep_range(2500, 3000);
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
DEVICE_READY);
|
2014-12-05 15:54:21 +07:00
|
|
|
usleep_range(2500, 3000);
|
|
|
|
}
|
2013-12-11 19:22:05 +07:00
|
|
|
}
|
|
|
|
|
2015-09-01 21:11:42 +07:00
|
|
|
static void intel_dsi_device_ready(struct intel_encoder *encoder)
|
|
|
|
{
|
2016-10-13 17:03:04 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2015-09-01 21:11:42 +07:00
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
if (IS_GEMINILAKE(dev_priv))
|
2017-03-01 14:21:33 +07:00
|
|
|
glk_dsi_device_ready(encoder);
|
2018-07-05 20:25:09 +07:00
|
|
|
else if (IS_GEN9_LP(dev_priv))
|
|
|
|
bxt_dsi_device_ready(encoder);
|
|
|
|
else
|
|
|
|
vlv_dsi_device_ready(encoder);
|
2015-09-01 21:11:42 +07:00
|
|
|
}
|
|
|
|
|
2017-03-01 14:21:33 +07:00
|
|
|
static void glk_dsi_enter_low_power_mode(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-03-01 14:21:33 +07:00
|
|
|
enum port port;
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
/* Enter ULPS */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DEVICE_READY(port));
|
2017-03-01 14:21:33 +07:00
|
|
|
val &= ~ULPS_STATE_MASK;
|
|
|
|
val |= (ULPS_STATE_ENTER | DEVICE_READY);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), val);
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for MIPI PHY status bit to unset */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_PHY_STATUS_PORT_READY, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "PHY is not turning OFF\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for Pwr ACK bit to unset */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_MIPIIO_PORT_POWERED, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"MIPI IO Port is not powergated\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void glk_dsi_disable_mipi_io(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-03-01 14:21:33 +07:00
|
|
|
enum port port;
|
|
|
|
u32 tmp;
|
|
|
|
|
|
|
|
/* Put the IO into reset */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(PORT_A));
|
2017-03-01 14:21:33 +07:00
|
|
|
tmp &= ~GLK_MIPIIO_RESET_RELEASED;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(PORT_A), tmp);
|
2017-03-01 14:21:33 +07:00
|
|
|
|
|
|
|
/* Wait for MIPI PHY status bit to unset */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2019-08-16 08:23:43 +07:00
|
|
|
if (intel_de_wait_for_clear(dev_priv, MIPI_CTRL(port),
|
|
|
|
GLK_PHY_STATUS_PORT_READY, 20))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "PHY is not turning OFF\n");
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear MIPI mode */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
2017-03-01 14:21:33 +07:00
|
|
|
tmp &= ~GLK_MIPIIO_ENABLE;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port), tmp);
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void glk_dsi_clear_device_ready(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
glk_dsi_enter_low_power_mode(encoder);
|
|
|
|
glk_dsi_disable_mipi_io(encoder);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder)
|
2017-02-28 16:26:19 +07:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-02-28 16:26:19 +07:00
|
|
|
enum port port;
|
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2017-02-28 16:26:19 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
|
|
|
/* Common bit for both MIPI Port A & MIPI Port C on VLV/CHV */
|
|
|
|
i915_reg_t port_ctrl = IS_GEN9_LP(dev_priv) ?
|
|
|
|
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(PORT_A);
|
|
|
|
u32 val;
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
DEVICE_READY | ULPS_STATE_ENTER);
|
2017-02-28 16:26:19 +07:00
|
|
|
usleep_range(2000, 2500);
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
DEVICE_READY | ULPS_STATE_EXIT);
|
2017-02-28 16:26:19 +07:00
|
|
|
usleep_range(2000, 2500);
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port),
|
|
|
|
DEVICE_READY | ULPS_STATE_ENTER);
|
2017-02-28 16:26:19 +07:00
|
|
|
usleep_range(2000, 2500);
|
|
|
|
|
2017-02-28 16:26:21 +07:00
|
|
|
/*
|
|
|
|
* On VLV/CHV, wait till Clock lanes are in LP-00 state for MIPI
|
|
|
|
* Port A only. MIPI Port C has no similar bit for checking.
|
2017-02-28 16:26:19 +07:00
|
|
|
*/
|
2017-02-28 16:26:21 +07:00
|
|
|
if ((IS_GEN9_LP(dev_priv) || port == PORT_A) &&
|
2019-08-16 08:23:43 +07:00
|
|
|
intel_de_wait_for_clear(dev_priv, port_ctrl,
|
|
|
|
AFE_LATCHOUT, 30))
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_err(&dev_priv->drm, "DSI LP not going Low\n");
|
2017-02-28 16:26:19 +07:00
|
|
|
|
|
|
|
/* Disable MIPI PHY transparent latch */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, port_ctrl);
|
|
|
|
intel_de_write(dev_priv, port_ctrl, val & ~LP_OUTPUT_HOLD);
|
2017-02-28 16:26:19 +07:00
|
|
|
usleep_range(1000, 1500);
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), 0x00);
|
2017-02-28 16:26:19 +07:00
|
|
|
usleep_range(2000, 2500);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-01 03:51:15 +07:00
|
|
|
static void intel_dsi_port_enable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2015-09-01 21:11:42 +07:00
|
|
|
{
|
2017-11-01 03:51:15 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 18:26:03 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2015-09-01 21:11:42 +07:00
|
|
|
enum port port;
|
|
|
|
|
|
|
|
if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
u32 temp;
|
2017-02-14 20:16:16 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
temp = intel_de_read(dev_priv,
|
|
|
|
MIPI_CTRL(port));
|
2017-02-14 20:16:16 +07:00
|
|
|
temp &= ~BXT_PIXEL_OVERLAP_CNT_MASK |
|
|
|
|
intel_dsi->pixel_overlap <<
|
|
|
|
BXT_PIXEL_OVERLAP_CNT_SHIFT;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port),
|
|
|
|
temp);
|
2017-02-14 20:16:16 +07:00
|
|
|
}
|
|
|
|
} else {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
temp = intel_de_read(dev_priv, VLV_CHICKEN_3);
|
2017-02-14 20:16:16 +07:00
|
|
|
temp &= ~PIXEL_OVERLAP_CNT_MASK |
|
2015-09-01 21:11:42 +07:00
|
|
|
intel_dsi->pixel_overlap <<
|
|
|
|
PIXEL_OVERLAP_CNT_SHIFT;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, VLV_CHICKEN_3, temp);
|
2017-02-14 20:16:16 +07:00
|
|
|
}
|
2015-09-01 21:11:42 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2016-12-02 15:23:49 +07:00
|
|
|
i915_reg_t port_ctrl = IS_GEN9_LP(dev_priv) ?
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
|
|
|
|
u32 temp;
|
2015-09-01 21:11:42 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
temp = intel_de_read(dev_priv, port_ctrl);
|
2015-09-01 21:11:42 +07:00
|
|
|
|
|
|
|
temp &= ~LANE_CONFIGURATION_MASK;
|
|
|
|
temp &= ~DUAL_LINK_MODE_MASK;
|
|
|
|
|
2016-03-18 22:05:43 +07:00
|
|
|
if (intel_dsi->ports == (BIT(PORT_A) | BIT(PORT_C))) {
|
2015-09-01 21:11:42 +07:00
|
|
|
temp |= (intel_dsi->dual_link - 1)
|
|
|
|
<< DUAL_LINK_MODE_SHIFT;
|
2016-11-22 05:24:06 +07:00
|
|
|
if (IS_BROXTON(dev_priv))
|
|
|
|
temp |= LANE_CONFIGURATION_DUAL_LINK_A;
|
|
|
|
else
|
2017-11-01 03:51:15 +07:00
|
|
|
temp |= crtc->pipe ?
|
2015-09-01 21:11:42 +07:00
|
|
|
LANE_CONFIGURATION_DUAL_LINK_B :
|
|
|
|
LANE_CONFIGURATION_DUAL_LINK_A;
|
|
|
|
}
|
2018-12-01 18:31:46 +07:00
|
|
|
|
|
|
|
if (intel_dsi->pixel_format != MIPI_DSI_FMT_RGB888)
|
|
|
|
temp |= DITHERING_ENABLE;
|
|
|
|
|
2015-09-01 21:11:42 +07:00
|
|
|
/* assert ip_tg_enable signal */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, port_ctrl, temp | DPI_ENABLE);
|
|
|
|
intel_de_posting_read(dev_priv, port_ctrl);
|
2015-09-01 21:11:42 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void intel_dsi_port_disable(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = encoder->base.dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2015-09-01 21:11:42 +07:00
|
|
|
enum port port;
|
|
|
|
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2016-12-02 15:23:49 +07:00
|
|
|
i915_reg_t port_ctrl = IS_GEN9_LP(dev_priv) ?
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
|
|
|
|
u32 temp;
|
|
|
|
|
2015-09-01 21:11:42 +07:00
|
|
|
/* de-assert ip_tg_enable signal */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
temp = intel_de_read(dev_priv, port_ctrl);
|
|
|
|
intel_de_write(dev_priv, port_ctrl, temp & ~DPI_ENABLE);
|
|
|
|
intel_de_posting_read(dev_priv, port_ctrl);
|
2015-09-01 21:11:42 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-09 22:04:09 +07:00
|
|
|
static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
|
2017-08-18 20:49:58 +07:00
|
|
|
const struct intel_crtc_state *pipe_config);
|
2017-02-28 16:26:18 +07:00
|
|
|
static void intel_dsi_unprepare(struct intel_encoder *encoder);
|
2015-11-27 17:21:44 +07:00
|
|
|
|
2017-03-01 20:14:57 +07:00
|
|
|
/*
|
|
|
|
* Panel enable/disable sequences from the VBT spec.
|
|
|
|
*
|
|
|
|
* Note the spec has AssertReset / DeassertReset swapped from their
|
|
|
|
* usual naming. We use the normal names to avoid confusion (so below
|
|
|
|
* they are swapped compared to the spec).
|
|
|
|
*
|
|
|
|
* Steps starting with MIPI refer to VBT sequences, note that for v2
|
|
|
|
* VBTs several steps which have a VBT in v2 are expected to be handled
|
|
|
|
* directly by the driver, by directly driving gpios for example.
|
|
|
|
*
|
|
|
|
* v2 video mode seq v3 video mode seq command mode seq
|
|
|
|
* - power on - MIPIPanelPowerOn - power on
|
|
|
|
* - wait t1+t2 - wait t1+t2
|
|
|
|
* - MIPIDeassertResetPin - MIPIDeassertResetPin - MIPIDeassertResetPin
|
|
|
|
* - io lines to lp-11 - io lines to lp-11 - io lines to lp-11
|
|
|
|
* - MIPISendInitialDcsCmds - MIPISendInitialDcsCmds - MIPISendInitialDcsCmds
|
|
|
|
* - MIPITearOn
|
|
|
|
* - MIPIDisplayOn
|
|
|
|
* - turn on DPI - turn on DPI - set pipe to dsr mode
|
|
|
|
* - MIPIDisplayOn - MIPIDisplayOn
|
|
|
|
* - wait t5 - wait t5
|
|
|
|
* - backlight on - MIPIBacklightOn - backlight on
|
|
|
|
* ... ... ... issue mem cmds ...
|
|
|
|
* - backlight off - MIPIBacklightOff - backlight off
|
|
|
|
* - wait t6 - wait t6
|
|
|
|
* - MIPIDisplayOff
|
|
|
|
* - turn off DPI - turn off DPI - disable pipe dsr mode
|
|
|
|
* - MIPITearOff
|
|
|
|
* - MIPIDisplayOff - MIPIDisplayOff
|
|
|
|
* - io lines to lp-00 - io lines to lp-00 - io lines to lp-00
|
|
|
|
* - MIPIAssertResetPin - MIPIAssertResetPin - MIPIAssertResetPin
|
|
|
|
* - wait t3 - wait t3
|
|
|
|
* - power off - MIPIPanelPowerOff - power off
|
|
|
|
* - wait t4 - wait t4
|
|
|
|
*/
|
|
|
|
|
2018-10-16 19:41:34 +07:00
|
|
|
/*
|
|
|
|
* DSI port enable has to be done before pipe and plane enable, so we do it in
|
|
|
|
* the pre_enable hook instead of the enable hook.
|
|
|
|
*/
|
2020-03-13 23:48:30 +07:00
|
|
|
static void intel_dsi_pre_enable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-08-18 20:49:58 +07:00
|
|
|
const struct intel_crtc_state *pipe_config,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2014-04-09 15:29:31 +07:00
|
|
|
{
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2019-10-31 18:26:03 +07:00
|
|
|
struct drm_crtc *crtc = pipe_config->uapi.crtc;
|
2017-10-05 17:52:12 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
|
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
2019-08-22 00:30:31 +07:00
|
|
|
enum pipe pipe = intel_crtc->pipe;
|
2017-02-28 16:26:17 +07:00
|
|
|
enum port port;
|
2017-01-25 21:13:23 +07:00
|
|
|
u32 val;
|
2017-06-13 14:48:15 +07:00
|
|
|
bool glk_cold_boot = false;
|
2014-04-09 15:29:31 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2014-04-09 15:29:31 +07:00
|
|
|
|
2017-10-05 17:52:12 +07:00
|
|
|
intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
|
|
|
|
|
2016-03-15 21:40:03 +07:00
|
|
|
/*
|
|
|
|
* The BIOS may leave the PLL in a wonky state where it doesn't
|
|
|
|
* lock. It needs to be fully powered down to fix it.
|
|
|
|
*/
|
2018-07-05 20:25:08 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
|
|
|
bxt_dsi_pll_disable(encoder);
|
|
|
|
bxt_dsi_pll_enable(encoder, pipe_config);
|
|
|
|
} else {
|
|
|
|
vlv_dsi_pll_disable(encoder);
|
|
|
|
vlv_dsi_pll_enable(encoder, pipe_config);
|
|
|
|
}
|
2016-03-15 21:40:03 +07:00
|
|
|
|
2017-01-25 21:13:23 +07:00
|
|
|
if (IS_BROXTON(dev_priv)) {
|
|
|
|
/* Add MIPI IO reset programming for modeset */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, BXT_P_CR_GT_DISP_PWRON);
|
|
|
|
intel_de_write(dev_priv, BXT_P_CR_GT_DISP_PWRON,
|
|
|
|
val | MIPIO_RST_CTRL);
|
2017-01-25 21:13:23 +07:00
|
|
|
|
|
|
|
/* Power up DSI regulator */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, BXT_P_DSI_REGULATOR_CFG, STAP_SELECT);
|
|
|
|
intel_de_write(dev_priv, BXT_P_DSI_REGULATOR_TX_CTRL, 0);
|
2017-01-25 21:13:23 +07:00
|
|
|
}
|
|
|
|
|
2016-04-18 23:18:25 +07:00
|
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
|
|
|
u32 val;
|
|
|
|
|
2016-04-13 02:14:34 +07:00
|
|
|
/* Disable DPOunit clock gating, can stall pipe */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, DSPCLK_GATE_D);
|
2016-04-18 23:18:25 +07:00
|
|
|
val |= DPOUNIT_CLOCK_GATE_DISABLE;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, DSPCLK_GATE_D, val);
|
2015-09-01 21:11:42 +07:00
|
|
|
}
|
2014-04-09 15:29:31 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
if (!IS_GEMINILAKE(dev_priv))
|
|
|
|
intel_dsi_prepare(encoder, pipe_config);
|
2017-03-01 20:15:00 +07:00
|
|
|
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_ON);
|
2017-03-01 20:15:06 +07:00
|
|
|
intel_dsi_msleep(intel_dsi, intel_dsi->panel_on_delay);
|
2017-03-01 20:15:00 +07:00
|
|
|
|
2017-03-01 20:15:01 +07:00
|
|
|
/* Deassert reset */
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DEASSERT_RESET);
|
2017-03-01 20:15:01 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
if (IS_GEMINILAKE(dev_priv)) {
|
|
|
|
glk_cold_boot = glk_dsi_enable_io(encoder);
|
|
|
|
|
|
|
|
/* Prepare port in cold boot(s3/s4) scenario */
|
|
|
|
if (glk_cold_boot)
|
|
|
|
intel_dsi_prepare(encoder, pipe_config);
|
|
|
|
}
|
2017-06-13 14:48:14 +07:00
|
|
|
|
2017-03-01 20:15:01 +07:00
|
|
|
/* Put device in ready state (LP-11) */
|
2014-04-09 15:29:31 +07:00
|
|
|
intel_dsi_device_ready(encoder);
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2017-06-13 14:48:15 +07:00
|
|
|
/* Prepare port in normal boot scenario */
|
|
|
|
if (IS_GEMINILAKE(dev_priv) && !glk_cold_boot)
|
|
|
|
intel_dsi_prepare(encoder, pipe_config);
|
|
|
|
|
2017-03-01 20:15:01 +07:00
|
|
|
/* Send initialization commands in LP mode */
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);
|
2014-04-09 15:29:32 +07:00
|
|
|
|
2014-04-09 15:29:31 +07:00
|
|
|
/* Enable port in pre-enable phase itself because as per hw team
|
|
|
|
* recommendation, port should be enabled befor plane & pipe */
|
2017-02-28 16:26:17 +07:00
|
|
|
if (is_cmd_mode(intel_dsi)) {
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports)
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4);
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_TEAR_ON);
|
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
|
2017-02-28 16:26:17 +07:00
|
|
|
} else {
|
|
|
|
msleep(20); /* XXX */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports)
|
|
|
|
dpi_send_cmd(intel_dsi, TURN_ON, false, port);
|
2017-03-01 20:15:06 +07:00
|
|
|
intel_dsi_msleep(intel_dsi, 100);
|
2017-02-28 16:26:17 +07:00
|
|
|
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
|
2017-02-28 16:26:17 +07:00
|
|
|
|
2017-11-01 03:51:15 +07:00
|
|
|
intel_dsi_port_enable(encoder, pipe_config);
|
2017-02-28 16:26:17 +07:00
|
|
|
}
|
|
|
|
|
2017-06-12 17:21:13 +07:00
|
|
|
intel_panel_enable_backlight(pipe_config, conn_state);
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);
|
2014-04-09 15:29:31 +07:00
|
|
|
}
|
|
|
|
|
2020-03-13 23:48:30 +07:00
|
|
|
static void bxt_dsi_enable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2020-01-28 23:28:48 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
2020-04-06 18:27:55 +07:00
|
|
|
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
|
2020-01-28 23:28:48 +07:00
|
|
|
|
|
|
|
intel_crtc_vblank_on(crtc_state);
|
|
|
|
}
|
|
|
|
|
2017-03-07 16:24:19 +07:00
|
|
|
/*
|
|
|
|
* DSI port disable has to be done after pipe and plane disable, so we do it in
|
|
|
|
* the post_disable hook.
|
|
|
|
*/
|
2020-03-13 23:48:30 +07:00
|
|
|
static void intel_dsi_disable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-08-18 20:49:58 +07:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2014-05-27 23:00:09 +07:00
|
|
|
{
|
drm/i915/dsi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436b6dde60dcba235085c8bb216c841267519fa6.1584714939.git.jani.nikula@intel.com
2020-03-20 21:36:32 +07:00
|
|
|
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2015-01-16 19:27:16 +07:00
|
|
|
enum port port;
|
2014-05-27 23:00:09 +07:00
|
|
|
|
drm/i915/dsi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436b6dde60dcba235085c8bb216c841267519fa6.1584714939.git.jani.nikula@intel.com
2020-03-20 21:36:32 +07:00
|
|
|
drm_dbg_kms(&i915->drm, "\n");
|
2014-05-27 23:00:09 +07:00
|
|
|
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_OFF);
|
2017-06-12 17:21:13 +07:00
|
|
|
intel_panel_disable_backlight(old_conn_state);
|
2015-06-26 16:02:10 +07:00
|
|
|
|
2017-03-01 20:15:03 +07:00
|
|
|
/*
|
|
|
|
* According to the spec we should send SHUTDOWN before
|
|
|
|
* MIPI_SEQ_DISPLAY_OFF only for v3+ VBTs, but field testing
|
|
|
|
* has shown that the v3 sequence works for v2 VBTs too
|
|
|
|
*/
|
2014-05-27 23:00:09 +07:00
|
|
|
if (is_vid_mode(intel_dsi)) {
|
|
|
|
/* Send Shutdown command to the panel in LP mode */
|
2015-01-16 19:27:16 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports)
|
2015-01-16 19:27:26 +07:00
|
|
|
dpi_send_cmd(intel_dsi, SHUTDOWN, false, port);
|
2014-05-27 23:00:09 +07:00
|
|
|
msleep(10);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-01 14:21:33 +07:00
|
|
|
static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
if (IS_GEMINILAKE(dev_priv))
|
2017-03-01 14:21:33 +07:00
|
|
|
glk_dsi_clear_device_ready(encoder);
|
2018-07-05 20:25:09 +07:00
|
|
|
else
|
|
|
|
vlv_dsi_clear_device_ready(encoder);
|
2017-03-01 14:21:33 +07:00
|
|
|
}
|
|
|
|
|
2020-03-13 23:48:30 +07:00
|
|
|
static void intel_dsi_post_disable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2019-12-14 02:52:17 +07:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2013-12-11 19:22:05 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-02-28 16:26:17 +07:00
|
|
|
enum port port;
|
2017-01-25 21:13:23 +07:00
|
|
|
u32 val;
|
2013-12-11 19:22:05 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2013-12-11 19:22:05 +07:00
|
|
|
|
2019-12-14 02:52:17 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
|
|
|
intel_crtc_vblank_off(old_crtc_state);
|
|
|
|
|
2019-12-24 15:40:06 +07:00
|
|
|
skl_scaler_disable(old_crtc_state);
|
2019-12-14 02:52:17 +07:00
|
|
|
}
|
|
|
|
|
2017-02-28 16:26:17 +07:00
|
|
|
if (is_vid_mode(intel_dsi)) {
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports)
|
2018-07-05 20:25:08 +07:00
|
|
|
vlv_dsi_wait_for_fifo_empty(intel_dsi, port);
|
2017-02-28 16:26:17 +07:00
|
|
|
|
|
|
|
intel_dsi_port_disable(encoder);
|
|
|
|
usleep_range(2000, 5000);
|
|
|
|
}
|
|
|
|
|
2017-02-28 16:26:18 +07:00
|
|
|
intel_dsi_unprepare(encoder);
|
2017-02-28 16:26:17 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if disable packets are sent before sending shutdown packet then in
|
|
|
|
* some next enable sequence send turn on packet error is observed
|
|
|
|
*/
|
2017-03-01 20:15:04 +07:00
|
|
|
if (is_cmd_mode(intel_dsi))
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_TEAR_OFF);
|
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_OFF);
|
2014-05-27 23:00:09 +07:00
|
|
|
|
2017-03-01 20:15:01 +07:00
|
|
|
/* Transition to LP-00 */
|
2013-12-11 19:22:05 +07:00
|
|
|
intel_dsi_clear_device_ready(encoder);
|
|
|
|
|
2017-01-25 21:13:23 +07:00
|
|
|
if (IS_BROXTON(dev_priv)) {
|
|
|
|
/* Power down DSI regulator to save power */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, BXT_P_DSI_REGULATOR_CFG, STAP_SELECT);
|
|
|
|
intel_de_write(dev_priv, BXT_P_DSI_REGULATOR_TX_CTRL,
|
|
|
|
HS_IO_CTRL_SELECT);
|
2017-01-25 21:13:23 +07:00
|
|
|
|
|
|
|
/* Add MIPI IO reset programming for modeset */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, BXT_P_CR_GT_DISP_PWRON);
|
|
|
|
intel_de_write(dev_priv, BXT_P_CR_GT_DISP_PWRON,
|
|
|
|
val & ~MIPIO_RST_CTRL);
|
2017-01-25 21:13:23 +07:00
|
|
|
}
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
|
|
|
bxt_dsi_pll_disable(encoder);
|
|
|
|
} else {
|
2016-02-18 18:49:26 +07:00
|
|
|
u32 val;
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
vlv_dsi_pll_disable(encoder);
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, DSPCLK_GATE_D);
|
2016-02-18 18:49:26 +07:00
|
|
|
val &= ~DPOUNIT_CLOCK_GATE_DISABLE;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, DSPCLK_GATE_D, val);
|
2016-02-18 18:49:26 +07:00
|
|
|
}
|
2014-04-09 15:29:32 +07:00
|
|
|
|
2017-03-01 20:15:01 +07:00
|
|
|
/* Assert reset */
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET);
|
2014-04-14 12:48:26 +07:00
|
|
|
|
2017-03-01 20:15:06 +07:00
|
|
|
intel_dsi_msleep(intel_dsi, intel_dsi->panel_off_delay);
|
2017-03-06 21:31:27 +07:00
|
|
|
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF);
|
2016-04-18 23:17:51 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* FIXME As we do with eDP, just make a note of the time here
|
|
|
|
* and perform the wait before the next panel power on.
|
|
|
|
*/
|
2017-03-01 20:15:06 +07:00
|
|
|
intel_dsi_msleep(intel_dsi, intel_dsi->panel_pwr_cycle_delay);
|
2013-12-11 19:22:05 +07:00
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
|
|
|
|
static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
|
|
|
|
enum pipe *pipe)
|
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2019-01-14 21:21:24 +07:00
|
|
|
intel_wakeref_t wakeref;
|
2014-11-14 21:54:21 +07:00
|
|
|
enum port port;
|
2016-03-16 02:51:11 +07:00
|
|
|
bool active = false;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2019-01-14 21:21:24 +07:00
|
|
|
wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
encoder->power_domain);
|
|
|
|
if (!wakeref)
|
2014-03-05 21:20:54 +07:00
|
|
|
return false;
|
|
|
|
|
2016-03-24 17:41:40 +07:00
|
|
|
/*
|
|
|
|
* On Broxton the PLL needs to be enabled with a valid divider
|
|
|
|
* configuration, otherwise accessing DSI registers will hang the
|
|
|
|
* machine. See BSpec North Display Engine registers/MIPI[BXT].
|
|
|
|
*/
|
2018-07-05 20:25:08 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv) && !bxt_dsi_pll_is_enabled(dev_priv))
|
2016-03-24 17:41:40 +07:00
|
|
|
goto out_put_power;
|
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
/* XXX: this only works for one DSI output */
|
2014-12-09 12:29:20 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2016-12-02 15:23:49 +07:00
|
|
|
i915_reg_t ctrl_reg = IS_GEN9_LP(dev_priv) ?
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
bool enabled = intel_de_read(dev_priv, ctrl_reg) & DPI_ENABLE;
|
2014-12-09 12:29:20 +07:00
|
|
|
|
2016-04-15 19:47:31 +07:00
|
|
|
/*
|
|
|
|
* Due to some hardware limitations on VLV/CHV, the DPI enable
|
|
|
|
* bit in port C control register does not get set. As a
|
|
|
|
* workaround, check pipe B conf instead.
|
2014-12-09 12:29:20 +07:00
|
|
|
*/
|
2016-10-14 16:13:44 +07:00
|
|
|
if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
|
|
|
|
port == PORT_C)
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
enabled = intel_de_read(dev_priv, PIPECONF(PIPE_B)) & PIPECONF_ENABLE;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-03-16 02:51:11 +07:00
|
|
|
/* Try command mode if video mode not enabled */
|
|
|
|
if (!enabled) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
u32 tmp = intel_de_read(dev_priv,
|
|
|
|
MIPI_DSI_FUNC_PRG(port));
|
2016-03-16 02:51:11 +07:00
|
|
|
enabled = tmp & CMD_MODE_DATA_WIDTH_MASK;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
2016-03-16 02:51:11 +07:00
|
|
|
|
|
|
|
if (!enabled)
|
|
|
|
continue;
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
if (!(intel_de_read(dev_priv, MIPI_DEVICE_READY(port)) & DEVICE_READY))
|
2016-03-16 02:51:11 +07:00
|
|
|
continue;
|
|
|
|
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
u32 tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
2016-03-16 02:51:12 +07:00
|
|
|
tmp &= BXT_PIPE_SELECT_MASK;
|
|
|
|
tmp >>= BXT_PIPE_SELECT_SHIFT;
|
|
|
|
|
drm/i915/display: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128181603.27767-20-pankaj.laxminarayan.bharadiya@intel.com
2020-01-29 01:16:01 +07:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, tmp > PIPE_C))
|
2016-03-16 02:51:12 +07:00
|
|
|
continue;
|
|
|
|
|
|
|
|
*pipe = tmp;
|
|
|
|
} else {
|
|
|
|
*pipe = port == PORT_A ? PIPE_A : PIPE_B;
|
|
|
|
}
|
|
|
|
|
2016-03-16 02:51:11 +07:00
|
|
|
active = true;
|
|
|
|
break;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
2016-03-16 02:51:11 +07:00
|
|
|
|
2016-03-24 17:41:40 +07:00
|
|
|
out_put_power:
|
2019-01-14 21:21:24 +07:00
|
|
|
intel_display_power_put(dev_priv, encoder->power_domain, wakeref);
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-03-16 02:51:11 +07:00
|
|
|
return active;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
2016-04-07 16:06:07 +07:00
|
|
|
static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
|
2017-08-18 20:49:58 +07:00
|
|
|
struct intel_crtc_state *pipe_config)
|
2016-04-07 16:06:07 +07:00
|
|
|
{
|
|
|
|
struct drm_device *dev = encoder->base.dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2016-04-07 16:06:07 +07:00
|
|
|
struct drm_display_mode *adjusted_mode =
|
2019-10-31 18:26:02 +07:00
|
|
|
&pipe_config->hw.adjusted_mode;
|
2016-04-19 15:18:14 +07:00
|
|
|
struct drm_display_mode *adjusted_mode_sw;
|
2019-10-31 18:26:03 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2016-04-19 15:18:13 +07:00
|
|
|
unsigned int lane_count = intel_dsi->lane_count;
|
2016-04-07 16:06:07 +07:00
|
|
|
unsigned int bpp, fmt;
|
|
|
|
enum port port;
|
2016-04-19 15:18:13 +07:00
|
|
|
u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp;
|
2016-04-19 15:18:14 +07:00
|
|
|
u16 hfp_sw, hsync_sw, hbp_sw;
|
|
|
|
u16 crtc_htotal_sw, crtc_hsync_start_sw, crtc_hsync_end_sw,
|
|
|
|
crtc_hblank_start_sw, crtc_hblank_end_sw;
|
|
|
|
|
2016-08-09 22:04:09 +07:00
|
|
|
/* FIXME: hw readout should not depend on SW state */
|
2019-10-31 18:26:02 +07:00
|
|
|
adjusted_mode_sw = &crtc->config->hw.adjusted_mode;
|
2016-04-07 16:06:07 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Atleast one port is active as encoder->get_config called only if
|
|
|
|
* encoder->get_hw_state() returns true.
|
|
|
|
*/
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
if (intel_de_read(dev_priv, BXT_MIPI_PORT_CTRL(port)) & DPI_ENABLE)
|
2016-04-07 16:06:07 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
fmt = intel_de_read(dev_priv, MIPI_DSI_FUNC_PRG(port)) & VID_MODE_FORMAT_MASK;
|
2018-12-01 18:31:45 +07:00
|
|
|
bpp = mipi_dsi_pixel_format_to_bpp(
|
|
|
|
pixel_format_from_register_bits(fmt));
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2019-04-05 21:13:49 +07:00
|
|
|
pipe_config->pipe_bpp = bdw_get_pipemisc_bpp(crtc);
|
|
|
|
|
2017-09-25 20:56:01 +07:00
|
|
|
/* Enable Frame time stamo based scanline reporting */
|
|
|
|
adjusted_mode->private_flags |=
|
|
|
|
I915_MODE_FLAG_GET_SCANLINE_FROM_TIMESTAMP;
|
|
|
|
|
2016-04-07 16:06:07 +07:00
|
|
|
/* In terms of pixels */
|
|
|
|
adjusted_mode->crtc_hdisplay =
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_read(dev_priv,
|
|
|
|
BXT_MIPI_TRANS_HACTIVE(port));
|
2016-04-07 16:06:07 +07:00
|
|
|
adjusted_mode->crtc_vdisplay =
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_read(dev_priv,
|
|
|
|
BXT_MIPI_TRANS_VACTIVE(port));
|
2016-04-07 16:06:07 +07:00
|
|
|
adjusted_mode->crtc_vtotal =
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_read(dev_priv,
|
|
|
|
BXT_MIPI_TRANS_VTOTAL(port));
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2016-04-19 15:18:13 +07:00
|
|
|
hactive = adjusted_mode->crtc_hdisplay;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
hfp = intel_de_read(dev_priv, MIPI_HFP_COUNT(port));
|
2016-04-19 15:18:13 +07:00
|
|
|
|
2016-04-07 16:06:07 +07:00
|
|
|
/*
|
2016-04-19 15:18:13 +07:00
|
|
|
* Meaningful for video mode non-burst sync pulse mode only,
|
|
|
|
* can be zero for non-burst sync events and burst modes
|
2016-04-07 16:06:07 +07:00
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
hsync = intel_de_read(dev_priv, MIPI_HSYNC_PADDING_COUNT(port));
|
|
|
|
hbp = intel_de_read(dev_priv, MIPI_HBP_COUNT(port));
|
2016-04-19 15:18:13 +07:00
|
|
|
|
|
|
|
/* harizontal values are in terms of high speed byte clock */
|
|
|
|
hfp = pixels_from_txbyteclkhs(hfp, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hsync = pixels_from_txbyteclkhs(hsync, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hbp = pixels_from_txbyteclkhs(hbp, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
|
|
|
|
if (intel_dsi->dual_link) {
|
|
|
|
hfp *= 2;
|
|
|
|
hsync *= 2;
|
|
|
|
hbp *= 2;
|
|
|
|
}
|
2016-04-07 16:06:07 +07:00
|
|
|
|
|
|
|
/* vertical values are in terms of lines */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
vfp = intel_de_read(dev_priv, MIPI_VFP_COUNT(port));
|
|
|
|
vsync = intel_de_read(dev_priv, MIPI_VSYNC_PADDING_COUNT(port));
|
|
|
|
vbp = intel_de_read(dev_priv, MIPI_VBP_COUNT(port));
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2016-04-19 15:18:13 +07:00
|
|
|
adjusted_mode->crtc_htotal = hactive + hfp + hsync + hbp;
|
|
|
|
adjusted_mode->crtc_hsync_start = hfp + adjusted_mode->crtc_hdisplay;
|
|
|
|
adjusted_mode->crtc_hsync_end = hsync + adjusted_mode->crtc_hsync_start;
|
2016-04-07 16:06:07 +07:00
|
|
|
adjusted_mode->crtc_hblank_start = adjusted_mode->crtc_hdisplay;
|
2016-04-19 15:18:13 +07:00
|
|
|
adjusted_mode->crtc_hblank_end = adjusted_mode->crtc_htotal;
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2016-04-19 15:18:13 +07:00
|
|
|
adjusted_mode->crtc_vsync_start = vfp + adjusted_mode->crtc_vdisplay;
|
|
|
|
adjusted_mode->crtc_vsync_end = vsync + adjusted_mode->crtc_vsync_start;
|
2016-04-07 16:06:07 +07:00
|
|
|
adjusted_mode->crtc_vblank_start = adjusted_mode->crtc_vdisplay;
|
|
|
|
adjusted_mode->crtc_vblank_end = adjusted_mode->crtc_vtotal;
|
|
|
|
|
2016-04-19 15:18:14 +07:00
|
|
|
/*
|
|
|
|
* In BXT DSI there is no regs programmed with few horizontal timings
|
|
|
|
* in Pixels but txbyteclkhs.. So retrieval process adds some
|
|
|
|
* ROUND_UP ERRORS in the process of PIXELS<==>txbyteclkhs.
|
|
|
|
* Actually here for the given adjusted_mode, we are calculating the
|
|
|
|
* value programmed to the port and then back to the horizontal timing
|
|
|
|
* param in pixels. This is the expected value, including roundup errors
|
|
|
|
* And if that is same as retrieved value from port, then
|
|
|
|
* (HW state) adjusted_mode's horizontal timings are corrected to
|
|
|
|
* match with SW state to nullify the errors.
|
|
|
|
*/
|
|
|
|
/* Calculating the value programmed to the Port register */
|
|
|
|
hfp_sw = adjusted_mode_sw->crtc_hsync_start -
|
|
|
|
adjusted_mode_sw->crtc_hdisplay;
|
|
|
|
hsync_sw = adjusted_mode_sw->crtc_hsync_end -
|
|
|
|
adjusted_mode_sw->crtc_hsync_start;
|
|
|
|
hbp_sw = adjusted_mode_sw->crtc_htotal -
|
|
|
|
adjusted_mode_sw->crtc_hsync_end;
|
|
|
|
|
|
|
|
if (intel_dsi->dual_link) {
|
|
|
|
hfp_sw /= 2;
|
|
|
|
hsync_sw /= 2;
|
|
|
|
hbp_sw /= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
hfp_sw = txbyteclkhs(hfp_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hsync_sw = txbyteclkhs(hsync_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hbp_sw = txbyteclkhs(hbp_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
|
|
|
|
/* Reverse calculating the adjusted mode parameters from port reg vals*/
|
|
|
|
hfp_sw = pixels_from_txbyteclkhs(hfp_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hsync_sw = pixels_from_txbyteclkhs(hsync_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
hbp_sw = pixels_from_txbyteclkhs(hbp_sw, bpp, lane_count,
|
|
|
|
intel_dsi->burst_mode_ratio);
|
|
|
|
|
|
|
|
if (intel_dsi->dual_link) {
|
|
|
|
hfp_sw *= 2;
|
|
|
|
hsync_sw *= 2;
|
|
|
|
hbp_sw *= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
crtc_htotal_sw = adjusted_mode_sw->crtc_hdisplay + hfp_sw +
|
|
|
|
hsync_sw + hbp_sw;
|
|
|
|
crtc_hsync_start_sw = hfp_sw + adjusted_mode_sw->crtc_hdisplay;
|
|
|
|
crtc_hsync_end_sw = hsync_sw + crtc_hsync_start_sw;
|
|
|
|
crtc_hblank_start_sw = adjusted_mode_sw->crtc_hdisplay;
|
|
|
|
crtc_hblank_end_sw = crtc_htotal_sw;
|
|
|
|
|
|
|
|
if (adjusted_mode->crtc_htotal == crtc_htotal_sw)
|
|
|
|
adjusted_mode->crtc_htotal = adjusted_mode_sw->crtc_htotal;
|
|
|
|
|
|
|
|
if (adjusted_mode->crtc_hsync_start == crtc_hsync_start_sw)
|
|
|
|
adjusted_mode->crtc_hsync_start =
|
|
|
|
adjusted_mode_sw->crtc_hsync_start;
|
|
|
|
|
|
|
|
if (adjusted_mode->crtc_hsync_end == crtc_hsync_end_sw)
|
|
|
|
adjusted_mode->crtc_hsync_end =
|
|
|
|
adjusted_mode_sw->crtc_hsync_end;
|
|
|
|
|
|
|
|
if (adjusted_mode->crtc_hblank_start == crtc_hblank_start_sw)
|
|
|
|
adjusted_mode->crtc_hblank_start =
|
|
|
|
adjusted_mode_sw->crtc_hblank_start;
|
|
|
|
|
|
|
|
if (adjusted_mode->crtc_hblank_end == crtc_hblank_end_sw)
|
|
|
|
adjusted_mode->crtc_hblank_end =
|
|
|
|
adjusted_mode_sw->crtc_hblank_end;
|
|
|
|
}
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
static void intel_dsi_get_config(struct intel_encoder *encoder,
|
2015-01-15 19:55:21 +07:00
|
|
|
struct intel_crtc_state *pipe_config)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
2016-10-13 17:03:04 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2016-01-08 17:45:39 +07:00
|
|
|
u32 pclk;
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2017-10-28 02:31:23 +07:00
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_DSI);
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
2016-04-07 16:06:07 +07:00
|
|
|
bxt_dsi_get_pipe_config(encoder, pipe_config);
|
2018-12-01 18:31:45 +07:00
|
|
|
pclk = bxt_dsi_get_pclk(encoder, pipe_config);
|
2018-07-05 20:25:08 +07:00
|
|
|
} else {
|
2018-12-01 18:31:45 +07:00
|
|
|
pclk = vlv_dsi_get_pclk(encoder, pipe_config);
|
2018-07-05 20:25:08 +07:00
|
|
|
}
|
2016-04-07 16:06:07 +07:00
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
if (pclk) {
|
2019-10-31 18:26:02 +07:00
|
|
|
pipe_config->hw.adjusted_mode.crtc_clock = pclk;
|
2018-07-05 20:25:08 +07:00
|
|
|
pipe_config->port_clock = pclk;
|
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* return txclkesc cycles in terms of divider and duration in us */
|
|
|
|
static u16 txclkesc(u32 divider, unsigned int us)
|
|
|
|
{
|
|
|
|
switch (divider) {
|
|
|
|
case ESCAPE_CLOCK_DIVIDER_1:
|
|
|
|
default:
|
|
|
|
return 20 * us;
|
|
|
|
case ESCAPE_CLOCK_DIVIDER_2:
|
|
|
|
return 10 * us;
|
|
|
|
case ESCAPE_CLOCK_DIVIDER_4:
|
|
|
|
return 5 * us;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void set_dsi_timings(struct drm_encoder *encoder,
|
2015-09-25 20:37:43 +07:00
|
|
|
const struct drm_display_mode *adjusted_mode)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(encoder));
|
2014-12-04 12:28:54 +07:00
|
|
|
enum port port;
|
2016-03-16 17:21:40 +07:00
|
|
|
unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
|
2013-08-27 19:12:20 +07:00
|
|
|
unsigned int lane_count = intel_dsi->lane_count;
|
|
|
|
|
|
|
|
u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp;
|
|
|
|
|
2015-09-25 20:38:56 +07:00
|
|
|
hactive = adjusted_mode->crtc_hdisplay;
|
|
|
|
hfp = adjusted_mode->crtc_hsync_start - adjusted_mode->crtc_hdisplay;
|
|
|
|
hsync = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
|
|
|
|
hbp = adjusted_mode->crtc_htotal - adjusted_mode->crtc_hsync_end;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-04 12:28:54 +07:00
|
|
|
if (intel_dsi->dual_link) {
|
|
|
|
hactive /= 2;
|
|
|
|
if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK)
|
|
|
|
hactive += intel_dsi->pixel_overlap;
|
|
|
|
hfp /= 2;
|
|
|
|
hsync /= 2;
|
|
|
|
hbp /= 2;
|
|
|
|
}
|
|
|
|
|
2015-09-25 20:38:56 +07:00
|
|
|
vfp = adjusted_mode->crtc_vsync_start - adjusted_mode->crtc_vdisplay;
|
|
|
|
vsync = adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start;
|
|
|
|
vbp = adjusted_mode->crtc_vtotal - adjusted_mode->crtc_vsync_end;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
|
|
|
/* horizontal values are in terms of high speed byte clock */
|
2014-07-30 22:04:57 +07:00
|
|
|
hactive = txbyteclkhs(hactive, bpp, lane_count,
|
2014-07-31 03:34:27 +07:00
|
|
|
intel_dsi->burst_mode_ratio);
|
2014-07-30 22:04:57 +07:00
|
|
|
hfp = txbyteclkhs(hfp, bpp, lane_count, intel_dsi->burst_mode_ratio);
|
|
|
|
hsync = txbyteclkhs(hsync, bpp, lane_count,
|
2014-07-31 03:34:27 +07:00
|
|
|
intel_dsi->burst_mode_ratio);
|
2014-07-30 22:04:57 +07:00
|
|
|
hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio);
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-04 12:28:54 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
2015-09-01 21:11:40 +07:00
|
|
|
/*
|
|
|
|
* Program hdisplay and vdisplay on MIPI transcoder.
|
|
|
|
* This is different from calculated hactive and
|
|
|
|
* vactive, as they are calculated per channel basis,
|
|
|
|
* whereas these values should be based on resolution.
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, BXT_MIPI_TRANS_HACTIVE(port),
|
|
|
|
adjusted_mode->crtc_hdisplay);
|
|
|
|
intel_de_write(dev_priv, BXT_MIPI_TRANS_VACTIVE(port),
|
|
|
|
adjusted_mode->crtc_vdisplay);
|
|
|
|
intel_de_write(dev_priv, BXT_MIPI_TRANS_VTOTAL(port),
|
|
|
|
adjusted_mode->crtc_vtotal);
|
2015-09-01 21:11:40 +07:00
|
|
|
}
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_HACTIVE_AREA_COUNT(port),
|
|
|
|
hactive);
|
|
|
|
intel_de_write(dev_priv, MIPI_HFP_COUNT(port), hfp);
|
2014-12-04 12:28:54 +07:00
|
|
|
|
|
|
|
/* meaningful for video mode non-burst sync pulse mode only,
|
|
|
|
* can be zero for non-burst sync events and burst modes */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_HSYNC_PADDING_COUNT(port),
|
|
|
|
hsync);
|
|
|
|
intel_de_write(dev_priv, MIPI_HBP_COUNT(port), hbp);
|
2014-12-04 12:28:54 +07:00
|
|
|
|
|
|
|
/* vertical values are in terms of lines */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_VFP_COUNT(port), vfp);
|
|
|
|
intel_de_write(dev_priv, MIPI_VSYNC_PADDING_COUNT(port),
|
|
|
|
vsync);
|
|
|
|
intel_de_write(dev_priv, MIPI_VBP_COUNT(port), vbp);
|
2014-12-04 12:28:54 +07:00
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
2016-03-16 17:21:40 +07:00
|
|
|
static u32 pixel_format_to_reg(enum mipi_dsi_pixel_format fmt)
|
|
|
|
{
|
|
|
|
switch (fmt) {
|
|
|
|
case MIPI_DSI_FMT_RGB888:
|
|
|
|
return VID_MODE_FORMAT_RGB888;
|
|
|
|
case MIPI_DSI_FMT_RGB666:
|
|
|
|
return VID_MODE_FORMAT_RGB666;
|
|
|
|
case MIPI_DSI_FMT_RGB666_PACKED:
|
|
|
|
return VID_MODE_FORMAT_RGB666_PACKED;
|
|
|
|
case MIPI_DSI_FMT_RGB565:
|
|
|
|
return VID_MODE_FORMAT_RGB565;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(fmt);
|
|
|
|
return VID_MODE_FORMAT_RGB666;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-09 22:04:09 +07:00
|
|
|
static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
|
2017-08-18 20:49:58 +07:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
|
|
|
struct drm_encoder *encoder = &intel_encoder->base;
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-10-31 18:26:03 +07:00
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(encoder));
|
2019-10-31 18:26:02 +07:00
|
|
|
const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
|
2014-12-05 15:54:21 +07:00
|
|
|
enum port port;
|
2016-03-16 17:21:40 +07:00
|
|
|
unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
|
2013-08-27 19:12:20 +07:00
|
|
|
u32 val, tmp;
|
2014-12-05 15:54:21 +07:00
|
|
|
u16 mode_hdisplay;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "pipe %c\n", pipe_name(intel_crtc->pipe));
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2015-09-25 20:38:56 +07:00
|
|
|
mode_hdisplay = adjusted_mode->crtc_hdisplay;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
if (intel_dsi->dual_link) {
|
|
|
|
mode_hdisplay /= 2;
|
|
|
|
if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK)
|
|
|
|
mode_hdisplay += intel_dsi->pixel_overlap;
|
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
2016-10-14 16:13:44 +07:00
|
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2015-09-01 21:11:40 +07:00
|
|
|
/*
|
|
|
|
* escape clock divider, 20MHz, shared for A and C.
|
|
|
|
* device ready must be off when doing this! txclkesc?
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(PORT_A));
|
2015-09-01 21:11:40 +07:00
|
|
|
tmp &= ~ESCAPE_CLOCK_DIVIDER_MASK;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(PORT_A),
|
|
|
|
tmp | ESCAPE_CLOCK_DIVIDER_1);
|
2015-09-01 21:11:40 +07:00
|
|
|
|
|
|
|
/* read request priority is per pipe */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
2015-09-01 21:11:40 +07:00
|
|
|
tmp &= ~READ_REQUEST_PRIORITY_MASK;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port),
|
|
|
|
tmp | READ_REQUEST_PRIORITY_HIGH);
|
2016-12-02 15:23:49 +07:00
|
|
|
} else if (IS_GEN9_LP(dev_priv)) {
|
2015-12-09 21:44:04 +07:00
|
|
|
enum pipe pipe = intel_crtc->pipe;
|
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
tmp = intel_de_read(dev_priv, MIPI_CTRL(port));
|
2015-09-01 21:11:40 +07:00
|
|
|
tmp &= ~BXT_PIPE_SELECT_MASK;
|
|
|
|
|
2015-12-09 21:44:04 +07:00
|
|
|
tmp |= BXT_PIPE_SELECT(pipe);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CTRL(port), tmp);
|
2015-09-01 21:11:40 +07:00
|
|
|
}
|
2014-12-05 15:54:21 +07:00
|
|
|
|
|
|
|
/* XXX: why here, why like this? handling in irq handler?! */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_INTR_STAT(port), 0xffffffff);
|
|
|
|
intel_de_write(dev_priv, MIPI_INTR_EN(port), 0xffffffff);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DPHY_PARAM(port),
|
|
|
|
intel_dsi->dphy_reg);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DPI_RESOLUTION(port),
|
|
|
|
adjusted_mode->crtc_vdisplay << VERTICAL_ADDRESS_SHIFT | mode_hdisplay << HORIZONTAL_ADDRESS_SHIFT);
|
2014-12-05 15:54:21 +07:00
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
|
|
|
|
set_dsi_timings(encoder, adjusted_mode);
|
|
|
|
|
|
|
|
val = intel_dsi->lane_count << DATA_LANES_PRG_REG_SHIFT;
|
|
|
|
if (is_cmd_mode(intel_dsi)) {
|
|
|
|
val |= intel_dsi->channel << CMD_MODE_CHANNEL_NUMBER_SHIFT;
|
|
|
|
val |= CMD_MODE_DATA_WIDTH_8_BIT; /* XXX */
|
|
|
|
} else {
|
|
|
|
val |= intel_dsi->channel << VID_MODE_CHANNEL_NUMBER_SHIFT;
|
2016-03-16 17:21:40 +07:00
|
|
|
val |= pixel_format_to_reg(intel_dsi->pixel_format);
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
tmp = 0;
|
|
|
|
if (intel_dsi->eotp_pkt == 0)
|
|
|
|
tmp |= EOT_DISABLE;
|
|
|
|
if (intel_dsi->clock_stop)
|
|
|
|
tmp |= CLOCKSTOP;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv)) {
|
2016-06-03 21:57:05 +07:00
|
|
|
tmp |= BXT_DPHY_DEFEATURE_EN;
|
|
|
|
if (!is_cmd_mode(intel_dsi))
|
|
|
|
tmp |= BXT_DEFEATURE_DPI_FIFO_CTR;
|
|
|
|
}
|
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DSI_FUNC_PRG(port), val);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
|
|
|
/* timeouts for recovery. one frame IIUC. if counter expires,
|
|
|
|
* EOT and stop state. */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In burst mode, value greater than one DPI line Time in byte
|
|
|
|
* clock (txbyteclkhs) To timeout this timer 1+ of the above
|
|
|
|
* said value is recommended.
|
|
|
|
*
|
|
|
|
* In non-burst mode, Value greater than one DPI frame time in
|
|
|
|
* byte clock(txbyteclkhs) To timeout this timer 1+ of the above
|
|
|
|
* said value is recommended.
|
|
|
|
*
|
|
|
|
* In DBI only mode, value greater than one DBI frame time in
|
|
|
|
* byte clock(txbyteclkhs) To timeout this timer 1+ of the above
|
|
|
|
* said value is recommended.
|
|
|
|
*/
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
if (is_vid_mode(intel_dsi) &&
|
|
|
|
intel_dsi->video_mode_format == VIDEO_MODE_BURST) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_HS_TX_TIMEOUT(port),
|
|
|
|
txbyteclkhs(adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1);
|
2014-12-05 15:54:21 +07:00
|
|
|
} else {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_HS_TX_TIMEOUT(port),
|
|
|
|
txbyteclkhs(adjusted_mode->crtc_vtotal * adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1);
|
2014-12-05 15:54:21 +07:00
|
|
|
}
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_LP_RX_TIMEOUT(port),
|
|
|
|
intel_dsi->lp_rx_timeout);
|
|
|
|
intel_de_write(dev_priv, MIPI_TURN_AROUND_TIMEOUT(port),
|
|
|
|
intel_dsi->turn_arnd_val);
|
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_RESET_TIMER(port),
|
|
|
|
intel_dsi->rst_timer_val);
|
2014-04-09 15:29:33 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* dphy stuff */
|
2014-04-09 15:29:33 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* in terms of low power clock */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_INIT_COUNT(port),
|
|
|
|
txclkesc(intel_dsi->escape_clk_div, 100));
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv) && (!intel_dsi->dual_link)) {
|
2015-09-01 21:11:40 +07:00
|
|
|
/*
|
|
|
|
* BXT spec says write MIPI_INIT_COUNT for
|
|
|
|
* both the ports, even if only one is
|
|
|
|
* getting used. So write the other port
|
|
|
|
* if not in dual link mode.
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
MIPI_INIT_COUNT(port == PORT_A ? PORT_C : PORT_A),
|
|
|
|
intel_dsi->init_count);
|
2015-09-01 21:11:40 +07:00
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* recovery disables */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_EOT_DISABLE(port), tmp);
|
2014-04-14 12:48:25 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* in terms of low power clock */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_INIT_COUNT(port),
|
|
|
|
intel_dsi->init_count);
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* in terms of txbyteclkhs. actual high to low switch +
|
|
|
|
* MIPI_STOP_STATE_STALL * MIPI_LP_BYTECLK.
|
|
|
|
*
|
|
|
|
* XXX: write MIPI_STOP_STATE_STALL?
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_HIGH_LOW_SWITCH_COUNT(port),
|
|
|
|
intel_dsi->hs_to_lp_count);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
|
|
|
/* XXX: low power clock equivalence in terms of byte clock.
|
|
|
|
* the number of byte clocks occupied in one low power clock.
|
|
|
|
* based on txbyteclkhs and txclkesc.
|
|
|
|
* txclkesc time / txbyteclk time * (105 + MIPI_STOP_STATE_STALL
|
|
|
|
* ) / 105.???
|
|
|
|
*/
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_LP_BYTECLK(port),
|
|
|
|
intel_dsi->lp_byte_clk);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
2017-02-17 19:43:30 +07:00
|
|
|
if (IS_GEMINILAKE(dev_priv)) {
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_TLPX_TIME_COUNT(port),
|
|
|
|
intel_dsi->lp_byte_clk);
|
2017-02-17 19:43:30 +07:00
|
|
|
/* Shadow of DPHY reg */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CLK_LANE_TIMING(port),
|
|
|
|
intel_dsi->dphy_reg);
|
2017-02-17 19:43:30 +07:00
|
|
|
}
|
|
|
|
|
2014-12-05 15:54:21 +07:00
|
|
|
/* the bw essential for transmitting 16 long packets containing
|
|
|
|
* 252 bytes meant for dcs write memory command is programmed in
|
|
|
|
* this register in terms of byte clocks. based on dsi transfer
|
|
|
|
* rate and the number of lanes configured the time taken to
|
|
|
|
* transmit 16 long packets in a dsi stream varies. */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DBI_BW_CTRL(port),
|
|
|
|
intel_dsi->bw_timer);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_CLK_LANE_SWITCH_TIME_CNT(port),
|
|
|
|
intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT | intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT);
|
2014-12-05 15:54:21 +07:00
|
|
|
|
|
|
|
if (is_vid_mode(intel_dsi))
|
|
|
|
/* Some panels might have resolution which is not a
|
|
|
|
* multiple of 64 like 1366 x 768. Enable RANDOM
|
|
|
|
* resolution support for such panels by default */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_VIDEO_MODE_FORMAT(port),
|
|
|
|
intel_dsi->video_frmt_cfg_bits | intel_dsi->video_mode_format | IP_TG_CONFIG | RANDOM_DPI_DISPLAY_RESOLUTION);
|
2014-12-05 15:54:21 +07:00
|
|
|
}
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
2017-02-28 16:26:18 +07:00
|
|
|
static void intel_dsi_unprepare(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
|
2017-02-28 16:26:18 +07:00
|
|
|
enum port port;
|
|
|
|
u32 val;
|
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
if (IS_GEMINILAKE(dev_priv))
|
|
|
|
return;
|
2017-02-28 16:26:18 +07:00
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
|
|
|
/* Panel commands can be sent when clock is in LP11 */
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), 0x0);
|
2017-02-28 16:26:18 +07:00
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
|
|
|
bxt_dsi_reset_clocks(encoder, port);
|
|
|
|
else
|
|
|
|
vlv_dsi_reset_clocks(encoder, port);
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_EOT_DISABLE(port), CLOCKSTOP);
|
2017-02-28 16:26:18 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
val = intel_de_read(dev_priv, MIPI_DSI_FUNC_PRG(port));
|
2018-07-05 20:25:09 +07:00
|
|
|
val &= ~VID_MODE_FORMAT_MASK;
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DSI_FUNC_PRG(port), val);
|
2018-07-05 20:25:09 +07:00
|
|
|
|
drm/i915/vlv_dsi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/436e4267529dc11cc7850d0a4f0703caa81b8c80.1579871655.git.jani.nikula@intel.com
2020-01-24 20:25:53 +07:00
|
|
|
intel_de_write(dev_priv, MIPI_DEVICE_READY(port), 0x1);
|
2017-02-28 16:26:18 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-23 20:30:56 +07:00
|
|
|
static void intel_dsi_encoder_destroy(struct drm_encoder *encoder)
|
|
|
|
{
|
2019-12-05 01:05:43 +07:00
|
|
|
struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(encoder));
|
2015-01-23 20:30:56 +07:00
|
|
|
|
2019-12-17 03:51:19 +07:00
|
|
|
intel_dsi_vbt_gpio_cleanup(intel_dsi);
|
2015-01-23 20:30:56 +07:00
|
|
|
intel_encoder_destroy(encoder);
|
|
|
|
}
|
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
static const struct drm_encoder_funcs intel_dsi_funcs = {
|
2015-01-23 20:30:56 +07:00
|
|
|
.destroy = intel_dsi_encoder_destroy,
|
2013-08-27 19:12:20 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
|
|
|
|
.get_modes = intel_dsi_get_modes,
|
|
|
|
.mode_valid = intel_dsi_mode_valid,
|
2017-05-01 20:37:58 +07:00
|
|
|
.atomic_check = intel_digital_connector_atomic_check,
|
2013-08-27 19:12:20 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
2016-06-24 20:00:15 +07:00
|
|
|
.late_register = intel_connector_register,
|
2016-06-17 17:40:33 +07:00
|
|
|
.early_unregister = intel_connector_unregister,
|
2018-10-09 21:11:03 +07:00
|
|
|
.destroy = intel_connector_destroy,
|
2013-08-27 19:12:20 +07:00
|
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
2017-05-01 20:37:58 +07:00
|
|
|
.atomic_get_property = intel_digital_connector_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_digital_connector_atomic_set_property,
|
2015-01-23 07:50:32 +07:00
|
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
2017-05-01 20:37:58 +07:00
|
|
|
.atomic_duplicate_state = intel_digital_connector_duplicate_state,
|
2013-08-27 19:12:20 +07:00
|
|
|
};
|
|
|
|
|
2019-06-27 22:24:57 +07:00
|
|
|
static void vlv_dsi_add_properties(struct intel_connector *connector)
|
2016-04-13 02:14:37 +07:00
|
|
|
{
|
2017-05-01 20:37:56 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2016-04-13 02:14:37 +07:00
|
|
|
|
|
|
|
if (connector->panel.fixed_mode) {
|
2017-05-01 20:37:56 +07:00
|
|
|
u32 allowed_scalers;
|
|
|
|
|
|
|
|
allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) | BIT(DRM_MODE_SCALE_FULLSCREEN);
|
2019-02-05 05:25:38 +07:00
|
|
|
if (!HAS_GMCH(dev_priv))
|
2017-05-01 20:37:56 +07:00
|
|
|
allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
|
|
|
|
|
|
|
|
drm_connector_attach_scaling_mode_property(&connector->base,
|
|
|
|
allowed_scalers);
|
|
|
|
|
2017-05-01 20:37:55 +07:00
|
|
|
connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
|
2017-11-26 02:35:51 +07:00
|
|
|
|
2020-01-05 22:51:19 +07:00
|
|
|
drm_connector_set_panel_orientation_with_quirk(
|
2017-11-26 02:35:51 +07:00
|
|
|
&connector->base,
|
2020-02-28 18:41:09 +07:00
|
|
|
intel_dsi_get_panel_orientation(connector),
|
2017-11-26 02:35:51 +07:00
|
|
|
connector->panel.fixed_mode->hdisplay,
|
|
|
|
connector->panel.fixed_mode->vdisplay);
|
2016-04-13 02:14:37 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-06 01:17:34 +07:00
|
|
|
#define NS_KHZ_RATIO 1000000
|
|
|
|
|
|
|
|
#define PREPARE_CNT_MAX 0x3F
|
|
|
|
#define EXIT_ZERO_CNT_MAX 0x3F
|
|
|
|
#define CLK_ZERO_CNT_MAX 0xFF
|
|
|
|
#define TRAIL_CNT_MAX 0x1F
|
|
|
|
|
|
|
|
static void vlv_dphy_param_init(struct intel_dsi *intel_dsi)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = intel_dsi->base.base.dev;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
|
|
|
struct mipi_config *mipi_config = dev_priv->vbt.dsi.config;
|
|
|
|
u32 tlpx_ns, extra_byte_count, tlpx_ui;
|
|
|
|
u32 ui_num, ui_den;
|
|
|
|
u32 prepare_cnt, exit_zero_cnt, clk_zero_cnt, trail_cnt;
|
|
|
|
u32 ths_prepare_ns, tclk_trail_ns;
|
|
|
|
u32 tclk_prepare_clkzero, ths_prepare_hszero;
|
|
|
|
u32 lp_to_hs_switch, hs_to_lp_switch;
|
|
|
|
u32 mul;
|
|
|
|
|
|
|
|
tlpx_ns = intel_dsi_tlpx_ns(intel_dsi);
|
|
|
|
|
|
|
|
switch (intel_dsi->lane_count) {
|
|
|
|
case 1:
|
|
|
|
case 2:
|
|
|
|
extra_byte_count = 2;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
extra_byte_count = 4;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
default:
|
|
|
|
extra_byte_count = 3;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* in Kbps */
|
|
|
|
ui_num = NS_KHZ_RATIO;
|
|
|
|
ui_den = intel_dsi_bitrate(intel_dsi);
|
|
|
|
|
|
|
|
tclk_prepare_clkzero = mipi_config->tclk_prepare_clkzero;
|
|
|
|
ths_prepare_hszero = mipi_config->ths_prepare_hszero;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* B060
|
|
|
|
* LP byte clock = TLPX/ (8UI)
|
|
|
|
*/
|
|
|
|
intel_dsi->lp_byte_clk = DIV_ROUND_UP(tlpx_ns * ui_den, 8 * ui_num);
|
|
|
|
|
|
|
|
/* DDR clock period = 2 * UI
|
|
|
|
* UI(sec) = 1/(bitrate * 10^3) (bitrate is in KHZ)
|
|
|
|
* UI(nsec) = 10^6 / bitrate
|
|
|
|
* DDR clock period (nsec) = 2 * UI = (2 * 10^6)/ bitrate
|
|
|
|
* DDR clock count = ns_value / DDR clock period
|
|
|
|
*
|
|
|
|
* For GEMINILAKE dphy_param_reg will be programmed in terms of
|
|
|
|
* HS byte clock count for other platform in HS ddr clock count
|
|
|
|
*/
|
|
|
|
mul = IS_GEMINILAKE(dev_priv) ? 8 : 2;
|
|
|
|
ths_prepare_ns = max(mipi_config->ths_prepare,
|
|
|
|
mipi_config->tclk_prepare);
|
|
|
|
|
|
|
|
/* prepare count */
|
|
|
|
prepare_cnt = DIV_ROUND_UP(ths_prepare_ns * ui_den, ui_num * mul);
|
|
|
|
|
|
|
|
if (prepare_cnt > PREPARE_CNT_MAX) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "prepare count too high %u\n",
|
|
|
|
prepare_cnt);
|
2019-06-06 01:17:34 +07:00
|
|
|
prepare_cnt = PREPARE_CNT_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* exit zero count */
|
|
|
|
exit_zero_cnt = DIV_ROUND_UP(
|
|
|
|
(ths_prepare_hszero - ths_prepare_ns) * ui_den,
|
|
|
|
ui_num * mul
|
|
|
|
);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exit zero is unified val ths_zero and ths_exit
|
|
|
|
* minimum value for ths_exit = 110ns
|
|
|
|
* min (exit_zero_cnt * 2) = 110/UI
|
|
|
|
* exit_zero_cnt = 55/UI
|
|
|
|
*/
|
|
|
|
if (exit_zero_cnt < (55 * ui_den / ui_num) && (55 * ui_den) % ui_num)
|
|
|
|
exit_zero_cnt += 1;
|
|
|
|
|
|
|
|
if (exit_zero_cnt > EXIT_ZERO_CNT_MAX) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "exit zero count too high %u\n",
|
|
|
|
exit_zero_cnt);
|
2019-06-06 01:17:34 +07:00
|
|
|
exit_zero_cnt = EXIT_ZERO_CNT_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clk zero count */
|
|
|
|
clk_zero_cnt = DIV_ROUND_UP(
|
|
|
|
(tclk_prepare_clkzero - ths_prepare_ns)
|
|
|
|
* ui_den, ui_num * mul);
|
|
|
|
|
|
|
|
if (clk_zero_cnt > CLK_ZERO_CNT_MAX) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "clock zero count too high %u\n",
|
|
|
|
clk_zero_cnt);
|
2019-06-06 01:17:34 +07:00
|
|
|
clk_zero_cnt = CLK_ZERO_CNT_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* trail count */
|
|
|
|
tclk_trail_ns = max(mipi_config->tclk_trail, mipi_config->ths_trail);
|
|
|
|
trail_cnt = DIV_ROUND_UP(tclk_trail_ns * ui_den, ui_num * mul);
|
|
|
|
|
|
|
|
if (trail_cnt > TRAIL_CNT_MAX) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "trail count too high %u\n",
|
|
|
|
trail_cnt);
|
2019-06-06 01:17:34 +07:00
|
|
|
trail_cnt = TRAIL_CNT_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* B080 */
|
|
|
|
intel_dsi->dphy_reg = exit_zero_cnt << 24 | trail_cnt << 16 |
|
|
|
|
clk_zero_cnt << 8 | prepare_cnt;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* LP to HS switch count = 4TLPX + PREP_COUNT * mul + EXIT_ZERO_COUNT *
|
|
|
|
* mul + 10UI + Extra Byte Count
|
|
|
|
*
|
|
|
|
* HS to LP switch count = THS-TRAIL + 2TLPX + Extra Byte Count
|
|
|
|
* Extra Byte Count is calculated according to number of lanes.
|
|
|
|
* High Low Switch Count is the Max of LP to HS and
|
|
|
|
* HS to LP switch count
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
tlpx_ui = DIV_ROUND_UP(tlpx_ns * ui_den, ui_num);
|
|
|
|
|
|
|
|
/* B044 */
|
|
|
|
/* FIXME:
|
|
|
|
* The comment above does not match with the code */
|
|
|
|
lp_to_hs_switch = DIV_ROUND_UP(4 * tlpx_ui + prepare_cnt * mul +
|
|
|
|
exit_zero_cnt * mul + 10, 8);
|
|
|
|
|
|
|
|
hs_to_lp_switch = DIV_ROUND_UP(mipi_config->ths_trail + 2 * tlpx_ui, 8);
|
|
|
|
|
|
|
|
intel_dsi->hs_to_lp_count = max(lp_to_hs_switch, hs_to_lp_switch);
|
|
|
|
intel_dsi->hs_to_lp_count += extra_byte_count;
|
|
|
|
|
|
|
|
/* B088 */
|
|
|
|
/* LP -> HS for clock lanes
|
|
|
|
* LP clk sync + LP11 + LP01 + tclk_prepare + tclk_zero +
|
|
|
|
* extra byte count
|
|
|
|
* 2TPLX + 1TLPX + 1 TPLX(in ns) + prepare_cnt * 2 + clk_zero_cnt *
|
|
|
|
* 2(in UI) + extra byte count
|
|
|
|
* In byteclks = (4TLPX + prepare_cnt * 2 + clk_zero_cnt *2 (in UI)) /
|
|
|
|
* 8 + extra byte count
|
|
|
|
*/
|
|
|
|
intel_dsi->clk_lp_to_hs_count =
|
|
|
|
DIV_ROUND_UP(
|
|
|
|
4 * tlpx_ui + prepare_cnt * 2 +
|
|
|
|
clk_zero_cnt * 2,
|
|
|
|
8);
|
|
|
|
|
|
|
|
intel_dsi->clk_lp_to_hs_count += extra_byte_count;
|
|
|
|
|
|
|
|
/* HS->LP for Clock Lanes
|
|
|
|
* Low Power clock synchronisations + 1Tx byteclk + tclk_trail +
|
|
|
|
* Extra byte count
|
|
|
|
* 2TLPX + 8UI + (trail_count*2)(in UI) + Extra byte count
|
|
|
|
* In byteclks = (2*TLpx(in UI) + trail_count*2 +8)(in UI)/8 +
|
|
|
|
* Extra byte count
|
|
|
|
*/
|
|
|
|
intel_dsi->clk_hs_to_lp_count =
|
|
|
|
DIV_ROUND_UP(2 * tlpx_ui + trail_cnt * 2 + 8,
|
|
|
|
8);
|
|
|
|
intel_dsi->clk_hs_to_lp_count += extra_byte_count;
|
|
|
|
|
|
|
|
intel_dsi_log_params(intel_dsi);
|
|
|
|
}
|
|
|
|
|
2018-07-05 20:25:08 +07:00
|
|
|
void vlv_dsi_init(struct drm_i915_private *dev_priv)
|
2013-08-27 19:12:20 +07:00
|
|
|
{
|
2016-11-23 21:21:44 +07:00
|
|
|
struct drm_device *dev = &dev_priv->drm;
|
2013-08-27 19:12:20 +07:00
|
|
|
struct intel_dsi *intel_dsi;
|
|
|
|
struct intel_encoder *intel_encoder;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
struct intel_connector *intel_connector;
|
|
|
|
struct drm_connector *connector;
|
2019-06-06 01:17:35 +07:00
|
|
|
struct drm_display_mode *current_mode, *fixed_mode;
|
2015-01-16 19:27:23 +07:00
|
|
|
enum port port;
|
2019-12-17 03:51:20 +07:00
|
|
|
enum pipe pipe;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "\n");
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2014-05-27 21:03:59 +07:00
|
|
|
/* There is no detection method for MIPI so rely on VBT */
|
2016-03-16 17:43:32 +07:00
|
|
|
if (!intel_bios_is_dsi_present(dev_priv, &port))
|
2014-05-28 18:30:56 +07:00
|
|
|
return;
|
2014-05-27 21:03:59 +07:00
|
|
|
|
2018-07-05 20:25:09 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
2016-03-22 17:01:50 +07:00
|
|
|
dev_priv->mipi_mmio_base = BXT_MIPI_BASE;
|
2018-07-05 20:25:09 +07:00
|
|
|
else
|
|
|
|
dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
|
2014-05-27 21:03:59 +07:00
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
intel_dsi = kzalloc(sizeof(*intel_dsi), GFP_KERNEL);
|
|
|
|
if (!intel_dsi)
|
2014-05-28 18:30:56 +07:00
|
|
|
return;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2015-04-10 14:59:10 +07:00
|
|
|
intel_connector = intel_connector_alloc();
|
2013-08-27 19:12:20 +07:00
|
|
|
if (!intel_connector) {
|
|
|
|
kfree(intel_dsi);
|
2014-05-28 18:30:56 +07:00
|
|
|
return;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
intel_encoder = &intel_dsi->base;
|
|
|
|
encoder = &intel_encoder->base;
|
|
|
|
intel_dsi->attached_connector = intel_connector;
|
|
|
|
|
|
|
|
connector = &intel_connector->base;
|
|
|
|
|
drm: Pass 'name' to drm_encoder_init()
Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.
@@
identifier dev, encoder, funcs;
@@
int drm_encoder_init(struct drm_device *dev,
struct drm_encoder *encoder,
const struct drm_encoder_funcs *funcs,
int encoder_type
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, encoder, funcs;
@@
int drm_encoder_init(struct drm_device *dev,
struct drm_encoder *encoder,
const struct drm_encoder_funcs *funcs,
int encoder_type
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4;
@@
drm_encoder_init(E1, E2, E3, E4
+ ,NULL
)
v2: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com
2015-12-09 21:20:18 +07:00
|
|
|
drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
|
2016-05-28 00:59:24 +07:00
|
|
|
"DSI %c", port_name(port));
|
2013-08-27 19:12:20 +07:00
|
|
|
|
|
|
|
intel_encoder->compute_config = intel_dsi_compute_config;
|
|
|
|
intel_encoder->pre_enable = intel_dsi_pre_enable;
|
2020-01-28 23:28:48 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
|
|
|
intel_encoder->enable = bxt_dsi_enable;
|
2017-03-07 16:24:19 +07:00
|
|
|
intel_encoder->disable = intel_dsi_disable;
|
2013-08-27 19:12:20 +07:00
|
|
|
intel_encoder->post_disable = intel_dsi_post_disable;
|
|
|
|
intel_encoder->get_hw_state = intel_dsi_get_hw_state;
|
|
|
|
intel_encoder->get_config = intel_dsi_get_config;
|
2019-01-08 23:08:38 +07:00
|
|
|
intel_encoder->update_pipe = intel_panel_update_backlight;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
|
|
|
intel_connector->get_hw_state = intel_connector_get_hw_state;
|
|
|
|
|
2016-09-20 08:24:38 +07:00
|
|
|
intel_encoder->port = port;
|
2019-06-06 01:17:35 +07:00
|
|
|
intel_encoder->type = INTEL_OUTPUT_DSI;
|
|
|
|
intel_encoder->power_domain = POWER_DOMAIN_PORT_DSI;
|
|
|
|
intel_encoder->cloneable = 0;
|
2017-02-22 13:34:27 +07:00
|
|
|
|
2016-03-18 22:05:44 +07:00
|
|
|
/*
|
|
|
|
* On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
|
|
|
|
* port C. BXT isn't limited like this.
|
|
|
|
*/
|
2016-12-02 15:23:49 +07:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
2019-10-02 23:25:04 +07:00
|
|
|
intel_encoder->pipe_mask = ~0;
|
2016-03-18 22:05:44 +07:00
|
|
|
else if (port == PORT_A)
|
2019-10-02 23:25:02 +07:00
|
|
|
intel_encoder->pipe_mask = BIT(PIPE_A);
|
2016-03-16 17:43:32 +07:00
|
|
|
else
|
2019-10-02 23:25:02 +07:00
|
|
|
intel_encoder->pipe_mask = BIT(PIPE_B);
|
2014-11-14 21:54:21 +07:00
|
|
|
|
2017-10-13 19:45:00 +07:00
|
|
|
if (dev_priv->vbt.dsi.config->dual_link)
|
2016-03-18 22:05:43 +07:00
|
|
|
intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);
|
2017-10-13 19:45:00 +07:00
|
|
|
else
|
2016-03-18 22:05:43 +07:00
|
|
|
intel_dsi->ports = BIT(port);
|
2015-08-03 17:15:32 +07:00
|
|
|
|
2017-10-13 19:45:00 +07:00
|
|
|
intel_dsi->dcs_backlight_ports = dev_priv->vbt.dsi.bl_ports;
|
|
|
|
intel_dsi->dcs_cabc_ports = dev_priv->vbt.dsi.cabc_ports;
|
2016-04-26 20:14:26 +07:00
|
|
|
|
2015-01-16 19:27:23 +07:00
|
|
|
/* Create a DSI host (and a device) for each port. */
|
|
|
|
for_each_dsi_port(port, intel_dsi->ports) {
|
|
|
|
struct intel_dsi_host *host;
|
|
|
|
|
2018-10-30 18:56:07 +07:00
|
|
|
host = intel_dsi_host_init(intel_dsi, &intel_dsi_host_ops,
|
|
|
|
port);
|
2015-01-16 19:27:23 +07:00
|
|
|
if (!host)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
intel_dsi->dsi_hosts[port] = host;
|
|
|
|
}
|
|
|
|
|
2017-03-06 21:31:26 +07:00
|
|
|
if (!intel_dsi_vbt_init(intel_dsi, MIPI_DSI_GENERIC_PANEL_ID)) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "no device found\n");
|
2013-08-27 19:12:20 +07:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2019-06-06 01:17:35 +07:00
|
|
|
/* Use clock read-back from current hw-state for fastboot */
|
|
|
|
current_mode = intel_encoder_current_mode(intel_encoder);
|
|
|
|
if (current_mode) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Calculated pclk %d GOP %d\n",
|
|
|
|
intel_dsi->pclk, current_mode->clock);
|
2019-06-06 01:17:35 +07:00
|
|
|
if (intel_fuzzy_clock_check(intel_dsi->pclk,
|
|
|
|
current_mode->clock)) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Using GOP pclk\n");
|
2019-06-06 01:17:35 +07:00
|
|
|
intel_dsi->pclk = current_mode->clock;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(current_mode);
|
|
|
|
}
|
|
|
|
|
2019-06-06 01:17:34 +07:00
|
|
|
vlv_dphy_param_init(intel_dsi);
|
|
|
|
|
2019-12-17 03:51:20 +07:00
|
|
|
intel_dsi_vbt_gpio_init(intel_dsi,
|
|
|
|
intel_dsi_get_hw_state(intel_encoder, &pipe));
|
2015-06-26 16:02:09 +07:00
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
drm_connector_init(dev, connector, &intel_dsi_connector_funcs,
|
|
|
|
DRM_MODE_CONNECTOR_DSI);
|
|
|
|
|
|
|
|
drm_connector_helper_add(connector, &intel_dsi_connector_helper_funcs);
|
|
|
|
|
|
|
|
connector->display_info.subpixel_order = SubPixelHorizontalRGB; /*XXX*/
|
|
|
|
connector->interlace_allowed = false;
|
|
|
|
connector->doublescan_allowed = false;
|
|
|
|
|
|
|
|
intel_connector_attach_encoder(intel_connector, intel_encoder);
|
|
|
|
|
2015-01-23 20:30:56 +07:00
|
|
|
mutex_lock(&dev->mode_config.mutex);
|
2019-03-21 20:24:44 +07:00
|
|
|
fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
|
2015-01-23 20:30:56 +07:00
|
|
|
mutex_unlock(&dev->mode_config.mutex);
|
|
|
|
|
2013-08-27 19:12:20 +07:00
|
|
|
if (!fixed_mode) {
|
drm/i915/vlv_dsi: conversion to drm_device based logging macros.
Converts the printk based logging macros to the struct drm_device based
logging macros in i915/display/vlv_dsi.c.
This was done using the following coccinelle script that transforms
based on the existence of a drm_i915_private device pointer.
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200130083229.12889-3-wambui.karugax@gmail.com
2020-01-30 15:32:19 +07:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "no fixed mode\n");
|
2019-05-24 23:35:18 +07:00
|
|
|
goto err_cleanup_connector;
|
2013-08-27 19:12:20 +07:00
|
|
|
}
|
|
|
|
|
Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available."
This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e.
Per the report, no matter what display mode you select with xrandr, the
i915 driver will always select the alternate fixed mode. For the
reporter this means that the display will always run at 40Hz which is
quite annoying. This may be due to the mode comparison.
But there are some other potential issues. The choice of alt_fixed_mode
seems dubious. It's the first non-preferred mode, but there are no
guarantees that the only difference would be refresh rate. Similarly,
there may be more than one preferred mode in the probed modes list, and
the commit changes the preferred mode selection to choose the last one
on the list instead of the first.
(Note that the probed modes list is the raw, unfiltered, unsorted list
of modes from drm_add_edid_modes(), not the pretty result after a
drm_helper_probe_single_connector_modes() call.)
Finally, we already have eerily similar code in place to find the
downclock mode for DRRS that seems like could be reused here.
Back to the drawing board.
Note: This is a hand-crafted revert due to conflicts. If it fails to
backport, please just try reverting the original commit directly.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469
Reported-by: Rune Petersen <rune@megahurts.dk>
Reported-by: Mark Spencer <n7u4722r35@ynzlx.anonbox.net>
Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.")
Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: David Weinehall <david.weinehall@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com
2018-05-16 15:01:10 +07:00
|
|
|
intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
|
2016-06-24 20:00:13 +07:00
|
|
|
intel_panel_setup_backlight(connector, INVALID_PIPE);
|
2016-04-13 02:14:37 +07:00
|
|
|
|
2019-06-27 22:24:57 +07:00
|
|
|
vlv_dsi_add_properties(intel_connector);
|
2016-04-13 02:14:37 +07:00
|
|
|
|
2014-05-28 18:30:56 +07:00
|
|
|
return;
|
2013-08-27 19:12:20 +07:00
|
|
|
|
2019-05-24 23:35:18 +07:00
|
|
|
err_cleanup_connector:
|
|
|
|
drm_connector_cleanup(&intel_connector->base);
|
2013-08-27 19:12:20 +07:00
|
|
|
err:
|
|
|
|
drm_encoder_cleanup(&intel_encoder->base);
|
|
|
|
kfree(intel_dsi);
|
|
|
|
kfree(intel_connector);
|
|
|
|
}
|