2009-01-02 13:33:00 -08:00
|
|
|
/*
|
|
|
|
* Copyright 2006 Dave Airlie <airlied@linux.ie>
|
|
|
|
* Copyright © 2006-2009 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
* DEALINGS IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/delay.h>
|
2013-08-06 20:32:18 +01:00
|
|
|
#include <linux/hdmi.h>
|
2019-04-05 14:00:03 +03:00
|
|
|
#include <linux/i2c.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
2015-01-22 16:50:32 -08:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2012-10-02 18:01:07 +01:00
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_edid.h>
|
2018-01-08 14:55:42 -05:00
|
|
|
#include <drm/drm_hdcp.h>
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
#include <drm/drm_scdc_helper.h>
|
2017-01-25 04:27:50 +05:30
|
|
|
#include <drm/intel_lpe_audio.h>
|
2019-04-05 14:00:03 +03:00
|
|
|
|
2019-05-02 18:02:43 +03:00
|
|
|
#include "i915_debugfs.h"
|
2009-01-02 13:33:00 -08:00
|
|
|
#include "i915_drv.h"
|
2019-04-29 15:53:31 +03:00
|
|
|
#include "intel_atomic.h"
|
2019-04-05 14:00:06 +03:00
|
|
|
#include "intel_connector.h"
|
2019-04-05 14:00:05 +03:00
|
|
|
#include "intel_ddi.h"
|
2021-04-30 17:39:44 +03:00
|
|
|
#include "intel_de.h"
|
2019-08-06 14:39:33 +03:00
|
|
|
#include "intel_display_types.h"
|
2019-04-05 14:00:17 +03:00
|
|
|
#include "intel_dp.h"
|
2019-05-02 18:02:47 +03:00
|
|
|
#include "intel_gmbus.h"
|
2019-04-05 14:00:13 +03:00
|
|
|
#include "intel_hdcp.h"
|
2019-04-05 14:00:18 +03:00
|
|
|
#include "intel_hdmi.h"
|
2019-04-05 14:00:11 +03:00
|
|
|
#include "intel_lspcon.h"
|
2019-04-05 14:00:14 +03:00
|
|
|
#include "intel_panel.h"
|
2021-07-23 10:42:33 -07:00
|
|
|
#include "intel_snps_phy.h"
|
2009-01-02 13:33:00 -08:00
|
|
|
|
2012-10-26 19:05:45 -02:00
|
|
|
static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)
|
|
|
|
{
|
2012-10-26 19:05:46 -02:00
|
|
|
return hdmi_to_dig_port(intel_hdmi)->base.base.dev;
|
2012-10-26 19:05:45 -02:00
|
|
|
}
|
|
|
|
|
2012-06-12 16:36:45 +02:00
|
|
|
static void
|
|
|
|
assert_hdmi_port_disabled(struct intel_hdmi *intel_hdmi)
|
|
|
|
{
|
2012-10-26 19:05:45 -02:00
|
|
|
struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi);
|
2016-07-04 11:34:36 +01:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2018-06-12 12:19:30 +03:00
|
|
|
u32 enabled_bits;
|
2012-06-12 16:36:45 +02:00
|
|
|
|
2016-10-13 11:02:52 +01:00
|
|
|
enabled_bits = HAS_DDI(dev_priv) ? DDI_BUF_CTL_ENABLE : SDVO_ENABLE;
|
2012-06-12 16:36:45 +02:00
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(dev,
|
|
|
|
intel_de_read(dev_priv, intel_hdmi->hdmi_reg) & enabled_bits,
|
|
|
|
"HDMI port enabled, expecting disabled\n");
|
2012-06-12 16:36:45 +02:00
|
|
|
}
|
|
|
|
|
2018-06-13 20:07:08 +03:00
|
|
|
static void
|
|
|
|
assert_hdmi_transcoder_func_disabled(struct drm_i915_private *dev_priv,
|
|
|
|
enum transcoder cpu_transcoder)
|
|
|
|
{
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm,
|
|
|
|
intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)) &
|
|
|
|
TRANS_DDI_FUNC_ENABLE,
|
|
|
|
"HDMI transcoder function enabled, expecting disabled\n");
|
2018-06-13 20:07:08 +03:00
|
|
|
}
|
|
|
|
|
2017-10-13 22:40:51 +03:00
|
|
|
static u32 g4x_infoframe_index(unsigned int type)
|
2010-09-24 21:44:32 +02:00
|
|
|
{
|
2013-08-06 20:32:18 +01:00
|
|
|
switch (type) {
|
2019-02-25 19:40:58 +02:00
|
|
|
case HDMI_PACKET_TYPE_GAMUT_METADATA:
|
|
|
|
return VIDEO_DIP_SELECT_GAMUT;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_AVI:
|
2012-05-14 17:12:50 -03:00
|
|
|
return VIDEO_DIP_SELECT_AVI;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_SPD:
|
2012-05-14 17:12:50 -03:00
|
|
|
return VIDEO_DIP_SELECT_SPD;
|
2013-08-19 16:59:04 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_VENDOR:
|
|
|
|
return VIDEO_DIP_SELECT_VENDOR;
|
2011-08-03 09:22:55 -07:00
|
|
|
default:
|
2015-12-16 18:10:00 +02:00
|
|
|
MISSING_CASE(type);
|
2012-05-14 17:12:50 -03:00
|
|
|
return 0;
|
2011-08-03 09:22:55 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-13 22:40:51 +03:00
|
|
|
static u32 g4x_infoframe_enable(unsigned int type)
|
2011-08-03 09:22:55 -07:00
|
|
|
{
|
2013-08-06 20:32:18 +01:00
|
|
|
switch (type) {
|
2019-02-25 19:40:58 +02:00
|
|
|
case HDMI_PACKET_TYPE_GENERAL_CONTROL:
|
|
|
|
return VIDEO_DIP_ENABLE_GCP;
|
|
|
|
case HDMI_PACKET_TYPE_GAMUT_METADATA:
|
|
|
|
return VIDEO_DIP_ENABLE_GAMUT;
|
2019-02-25 19:40:59 +02:00
|
|
|
case DP_SDP_VSC:
|
|
|
|
return 0;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_AVI:
|
2012-05-14 17:12:50 -03:00
|
|
|
return VIDEO_DIP_ENABLE_AVI;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_SPD:
|
2012-05-14 17:12:50 -03:00
|
|
|
return VIDEO_DIP_ENABLE_SPD;
|
2013-08-19 16:59:04 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_VENDOR:
|
|
|
|
return VIDEO_DIP_ENABLE_VENDOR;
|
2019-05-16 19:40:15 +05:30
|
|
|
case HDMI_INFOFRAME_TYPE_DRM:
|
|
|
|
return 0;
|
2012-05-04 17:18:20 -03:00
|
|
|
default:
|
2015-12-16 18:10:00 +02:00
|
|
|
MISSING_CASE(type);
|
2012-05-14 17:12:50 -03:00
|
|
|
return 0;
|
2012-05-04 17:18:20 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-13 22:40:51 +03:00
|
|
|
static u32 hsw_infoframe_enable(unsigned int type)
|
2012-05-14 17:12:51 -03:00
|
|
|
{
|
2013-08-06 20:32:18 +01:00
|
|
|
switch (type) {
|
2019-02-25 19:40:58 +02:00
|
|
|
case HDMI_PACKET_TYPE_GENERAL_CONTROL:
|
|
|
|
return VIDEO_DIP_ENABLE_GCP_HSW;
|
|
|
|
case HDMI_PACKET_TYPE_GAMUT_METADATA:
|
|
|
|
return VIDEO_DIP_ENABLE_GMP_HSW;
|
2017-10-13 22:40:51 +03:00
|
|
|
case DP_SDP_VSC:
|
|
|
|
return VIDEO_DIP_ENABLE_VSC_HSW;
|
2018-11-28 12:26:20 -08:00
|
|
|
case DP_SDP_PPS:
|
|
|
|
return VDIP_ENABLE_PPS;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_AVI:
|
2012-05-14 17:12:51 -03:00
|
|
|
return VIDEO_DIP_ENABLE_AVI_HSW;
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_SPD:
|
2012-05-14 17:12:51 -03:00
|
|
|
return VIDEO_DIP_ENABLE_SPD_HSW;
|
2013-08-19 16:59:04 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_VENDOR:
|
|
|
|
return VIDEO_DIP_ENABLE_VS_HSW;
|
2019-05-17 21:52:25 +05:30
|
|
|
case HDMI_INFOFRAME_TYPE_DRM:
|
|
|
|
return VIDEO_DIP_ENABLE_DRM_GLK;
|
2012-05-14 17:12:51 -03:00
|
|
|
default:
|
2015-12-16 18:10:00 +02:00
|
|
|
MISSING_CASE(type);
|
2012-05-14 17:12:51 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 15:33:26 +02:00
|
|
|
static i915_reg_t
|
|
|
|
hsw_dip_data_reg(struct drm_i915_private *dev_priv,
|
|
|
|
enum transcoder cpu_transcoder,
|
2017-10-13 22:40:51 +03:00
|
|
|
unsigned int type,
|
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 15:33:26 +02:00
|
|
|
int i)
|
2012-05-14 17:12:51 -03:00
|
|
|
{
|
2013-08-06 20:32:18 +01:00
|
|
|
switch (type) {
|
2019-02-25 19:40:58 +02:00
|
|
|
case HDMI_PACKET_TYPE_GAMUT_METADATA:
|
|
|
|
return HSW_TVIDEO_DIP_GMP_DATA(cpu_transcoder, i);
|
2017-10-13 22:40:51 +03:00
|
|
|
case DP_SDP_VSC:
|
|
|
|
return HSW_TVIDEO_DIP_VSC_DATA(cpu_transcoder, i);
|
2018-11-28 12:26:20 -08:00
|
|
|
case DP_SDP_PPS:
|
|
|
|
return ICL_VIDEO_DIP_PPS_DATA(cpu_transcoder, i);
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_AVI:
|
2015-09-18 20:03:37 +03:00
|
|
|
return HSW_TVIDEO_DIP_AVI_DATA(cpu_transcoder, i);
|
2013-08-06 20:32:18 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_SPD:
|
2015-09-18 20:03:37 +03:00
|
|
|
return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder, i);
|
2013-08-19 16:59:04 +01:00
|
|
|
case HDMI_INFOFRAME_TYPE_VENDOR:
|
2015-09-18 20:03:37 +03:00
|
|
|
return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder, i);
|
2019-05-17 21:52:25 +05:30
|
|
|
case HDMI_INFOFRAME_TYPE_DRM:
|
|
|
|
return GLK_TVIDEO_DIP_DRM_DATA(cpu_transcoder, i);
|
2012-05-14 17:12:51 -03:00
|
|
|
default:
|
2015-12-16 18:10:00 +02:00
|
|
|
MISSING_CASE(type);
|
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 15:33:26 +02:00
|
|
|
return INVALID_MMIO_REG;
|
2012-05-14 17:12:51 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-19 22:53:09 +03:00
|
|
|
static int hsw_dip_data_size(struct drm_i915_private *dev_priv,
|
|
|
|
unsigned int type)
|
2018-11-28 12:26:20 -08:00
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case DP_SDP_VSC:
|
|
|
|
return VIDEO_DIP_VSC_DATA_SIZE;
|
|
|
|
case DP_SDP_PPS:
|
|
|
|
return VIDEO_DIP_PPS_DATA_SIZE;
|
2019-09-19 22:53:09 +03:00
|
|
|
case HDMI_PACKET_TYPE_GAMUT_METADATA:
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 11)
|
2019-09-19 22:53:09 +03:00
|
|
|
return VIDEO_DIP_GMP_DATA_SIZE;
|
|
|
|
else
|
|
|
|
return VIDEO_DIP_DATA_SIZE;
|
2018-11-28 12:26:20 -08:00
|
|
|
default:
|
|
|
|
return VIDEO_DIP_DATA_SIZE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void g4x_write_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-10-13 22:40:51 +03:00
|
|
|
unsigned int type,
|
2013-12-10 15:19:08 +02:00
|
|
|
const void *frame, ssize_t len)
|
2011-08-03 09:22:55 -07:00
|
|
|
{
|
2018-06-12 12:19:30 +03:00
|
|
|
const u32 *data = frame;
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, VIDEO_DIP_CTL);
|
2013-08-06 20:32:18 +01:00
|
|
|
int i;
|
2010-09-24 21:44:32 +02:00
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, !(val & VIDEO_DIP_ENABLE),
|
|
|
|
"Writing DIP with CTL reg disabled\n");
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2012-05-04 17:18:18 -03:00
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_index(type);
|
2012-05-04 17:18:17 -03:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val &= ~g4x_infoframe_enable(type);
|
2011-08-03 09:22:55 -07:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VIDEO_DIP_CTL, val);
|
2010-09-24 21:44:32 +02:00
|
|
|
|
2011-08-03 09:22:55 -07:00
|
|
|
for (i = 0; i < len; i += 4) {
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VIDEO_DIP_DATA, *data);
|
2010-09-24 21:44:32 +02:00
|
|
|
data++;
|
|
|
|
}
|
2012-09-25 13:23:34 -03:00
|
|
|
/* Write every possible data byte to force correct ECC calculation. */
|
|
|
|
for (; i < VIDEO_DIP_DATA_SIZE; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VIDEO_DIP_DATA, 0);
|
2010-09-24 21:44:32 +02:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_enable(type);
|
2012-05-04 17:18:22 -03:00
|
|
|
val &= ~VIDEO_DIP_FREQ_MASK;
|
2012-05-08 14:41:00 +02:00
|
|
|
val |= VIDEO_DIP_FREQ_VSYNC;
|
2011-08-03 09:22:55 -07:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VIDEO_DIP_CTL, val);
|
|
|
|
intel_de_posting_read(dev_priv, VIDEO_DIP_CTL);
|
2010-09-24 21:44:32 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
static void g4x_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type,
|
|
|
|
void *frame, ssize_t len)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
u32 val, *data = frame;
|
|
|
|
int i;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
val = intel_de_read(dev_priv, VIDEO_DIP_CTL);
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
|
|
|
val |= g4x_infoframe_index(type);
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VIDEO_DIP_CTL, val);
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data++ = intel_de_read(dev_priv, VIDEO_DIP_DATA);
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static u32 g4x_infoframes_enabled(struct intel_encoder *encoder,
|
2015-11-26 18:27:07 +02:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2014-11-05 14:26:08 -08:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, VIDEO_DIP_CTL);
|
2014-11-05 14:26:08 -08:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
if ((val & VIDEO_DIP_ENABLE) == 0)
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2014-11-20 13:24:13 -08:00
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(encoder->port))
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-05-05 17:06:25 +03:00
|
|
|
|
|
|
|
return val & (VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
|
2014-11-05 14:26:08 -08:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void ibx_write_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-10-13 22:40:51 +03:00
|
|
|
unsigned int type,
|
2013-12-10 15:19:08 +02:00
|
|
|
const void *frame, ssize_t len)
|
2012-05-04 17:18:24 -03:00
|
|
|
{
|
2018-06-12 12:19:30 +03:00
|
|
|
const u32 *data = frame;
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
|
|
|
i915_reg_t reg = TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
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 15:33:26 +02:00
|
|
|
int i;
|
2012-05-04 17:18:24 -03:00
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, !(val & VIDEO_DIP_ENABLE),
|
|
|
|
"Writing DIP with CTL reg disabled\n");
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2012-05-04 17:18:24 -03:00
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_index(type);
|
2012-05-04 17:18:24 -03:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val &= ~g4x_infoframe_enable(type);
|
2012-05-04 17:18:24 -03:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
2012-05-04 17:18:24 -03:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
2021-06-09 11:56:32 +03:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_DATA(crtc->pipe),
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data);
|
2012-05-04 17:18:24 -03:00
|
|
|
data++;
|
|
|
|
}
|
2012-09-25 13:23:34 -03:00
|
|
|
/* Write every possible data byte to force correct ECC calculation. */
|
|
|
|
for (; i < VIDEO_DIP_DATA_SIZE; i += 4)
|
2021-06-09 11:56:32 +03:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_DATA(crtc->pipe), 0);
|
2012-05-04 17:18:24 -03:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_enable(type);
|
2012-05-04 17:18:24 -03:00
|
|
|
val &= ~VIDEO_DIP_FREQ_MASK;
|
2012-05-08 14:41:00 +02:00
|
|
|
val |= VIDEO_DIP_FREQ_VSYNC;
|
2012-05-04 17:18:24 -03:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-04 17:18:24 -03:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
static void ibx_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type,
|
|
|
|
void *frame, ssize_t len)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-02-25 19:41:02 +02:00
|
|
|
u32 val, *data = frame;
|
|
|
|
int i;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
val = intel_de_read(dev_priv, TVIDEO_DIP_CTL(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
|
|
|
val |= g4x_infoframe_index(type);
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_CTL(crtc->pipe), val);
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data++ = intel_de_read(dev_priv, TVIDEO_DIP_DATA(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static u32 ibx_infoframes_enabled(struct intel_encoder *encoder,
|
2015-11-26 18:27:07 +02:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2014-11-05 14:26:08 -08:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
enum pipe pipe = to_intel_crtc(pipe_config->uapi.crtc)->pipe;
|
2015-11-26 18:27:07 +02:00
|
|
|
i915_reg_t reg = TVIDEO_DIP_CTL(pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
2014-11-05 14:26:08 -08:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
if ((val & VIDEO_DIP_ENABLE) == 0)
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-05-05 17:06:25 +03:00
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(encoder->port))
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-04-29 15:30:07 +03:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
return val & (VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2014-11-05 14:26:08 -08:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void cpt_write_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-10-13 22:40:51 +03:00
|
|
|
unsigned int type,
|
2013-12-10 15:19:08 +02:00
|
|
|
const void *frame, ssize_t len)
|
2011-07-08 11:31:57 -07:00
|
|
|
{
|
2018-06-12 12:19:30 +03:00
|
|
|
const u32 *data = frame;
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
|
|
|
i915_reg_t reg = TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
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 15:33:26 +02:00
|
|
|
int i;
|
2011-07-08 11:31:57 -07:00
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, !(val & VIDEO_DIP_ENABLE),
|
|
|
|
"Writing DIP with CTL reg disabled\n");
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2011-09-22 11:16:00 +05:30
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_index(type);
|
2011-08-03 09:22:55 -07:00
|
|
|
|
2012-05-04 17:18:21 -03:00
|
|
|
/* The DIP control register spec says that we need to update the AVI
|
|
|
|
* infoframe without clearing its enable bit */
|
2013-08-06 20:32:18 +01:00
|
|
|
if (type != HDMI_INFOFRAME_TYPE_AVI)
|
|
|
|
val &= ~g4x_infoframe_enable(type);
|
2012-05-04 17:18:21 -03:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
2011-08-03 09:22:55 -07:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
2021-06-09 11:56:32 +03:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_DATA(crtc->pipe),
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data);
|
2011-07-08 11:31:57 -07:00
|
|
|
data++;
|
|
|
|
}
|
2012-09-25 13:23:34 -03:00
|
|
|
/* Write every possible data byte to force correct ECC calculation. */
|
|
|
|
for (; i < VIDEO_DIP_DATA_SIZE; i += 4)
|
2021-06-09 11:56:32 +03:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_DATA(crtc->pipe), 0);
|
2011-07-08 11:31:57 -07:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_enable(type);
|
2012-05-04 17:18:22 -03:00
|
|
|
val &= ~VIDEO_DIP_FREQ_MASK;
|
2012-05-08 14:41:00 +02:00
|
|
|
val |= VIDEO_DIP_FREQ_VSYNC;
|
2011-08-03 09:22:55 -07:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2011-08-03 09:22:55 -07:00
|
|
|
}
|
2012-03-28 13:39:32 -07:00
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
static void cpt_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type,
|
|
|
|
void *frame, ssize_t len)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-02-25 19:41:02 +02:00
|
|
|
u32 val, *data = frame;
|
|
|
|
int i;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
val = intel_de_read(dev_priv, TVIDEO_DIP_CTL(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
|
|
|
val |= g4x_infoframe_index(type);
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, TVIDEO_DIP_CTL(crtc->pipe), val);
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data++ = intel_de_read(dev_priv, TVIDEO_DIP_DATA(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static u32 cpt_infoframes_enabled(struct intel_encoder *encoder,
|
2015-11-26 18:27:07 +02:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2014-11-05 14:26:08 -08:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
enum pipe pipe = to_intel_crtc(pipe_config->uapi.crtc)->pipe;
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, TVIDEO_DIP_CTL(pipe));
|
2014-11-05 14:26:08 -08:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
if ((val & VIDEO_DIP_ENABLE) == 0)
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-05-05 17:06:25 +03:00
|
|
|
|
|
|
|
return val & (VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2014-11-05 14:26:08 -08:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void vlv_write_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-10-13 22:40:51 +03:00
|
|
|
unsigned int type,
|
2013-12-10 15:19:08 +02:00
|
|
|
const void *frame, ssize_t len)
|
2012-03-28 13:39:32 -07:00
|
|
|
{
|
2018-06-12 12:19:30 +03:00
|
|
|
const u32 *data = frame;
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
|
|
|
i915_reg_t reg = VLV_TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
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 15:33:26 +02:00
|
|
|
int i;
|
2012-03-28 13:39:32 -07:00
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, !(val & VIDEO_DIP_ENABLE),
|
|
|
|
"Writing DIP with CTL reg disabled\n");
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2012-03-28 13:39:32 -07:00
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_index(type);
|
2012-05-04 17:18:17 -03:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val &= ~g4x_infoframe_enable(type);
|
2012-03-28 13:39:32 -07:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
2012-03-28 13:39:32 -07:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv,
|
2021-06-09 11:56:32 +03:00
|
|
|
VLV_TVIDEO_DIP_DATA(crtc->pipe), *data);
|
2012-03-28 13:39:32 -07:00
|
|
|
data++;
|
|
|
|
}
|
2012-09-25 13:23:34 -03:00
|
|
|
/* Write every possible data byte to force correct ECC calculation. */
|
|
|
|
for (; i < VIDEO_DIP_DATA_SIZE; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv,
|
2021-06-09 11:56:32 +03:00
|
|
|
VLV_TVIDEO_DIP_DATA(crtc->pipe), 0);
|
2012-03-28 13:39:32 -07:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= g4x_infoframe_enable(type);
|
2012-05-04 17:18:22 -03:00
|
|
|
val &= ~VIDEO_DIP_FREQ_MASK;
|
2012-05-08 14:41:00 +02:00
|
|
|
val |= VIDEO_DIP_FREQ_VSYNC;
|
2012-03-28 13:39:32 -07:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-03-28 13:39:32 -07:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
static void vlv_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type,
|
|
|
|
void *frame, ssize_t len)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-02-25 19:41:02 +02:00
|
|
|
u32 val, *data = frame;
|
|
|
|
int i;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
val = intel_de_read(dev_priv, VLV_TVIDEO_DIP_CTL(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
|
|
|
|
val |= g4x_infoframe_index(type);
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, VLV_TVIDEO_DIP_CTL(crtc->pipe), val);
|
2019-02-25 19:41:02 +02:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data++ = intel_de_read(dev_priv,
|
|
|
|
VLV_TVIDEO_DIP_DATA(crtc->pipe));
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static u32 vlv_infoframes_enabled(struct intel_encoder *encoder,
|
2015-11-26 18:27:07 +02:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2014-11-05 14:26:08 -08:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
enum pipe pipe = to_intel_crtc(pipe_config->uapi.crtc)->pipe;
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, VLV_TVIDEO_DIP_CTL(pipe));
|
2014-11-05 14:26:08 -08:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
if ((val & VIDEO_DIP_ENABLE) == 0)
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-05-05 17:06:25 +03:00
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(encoder->port))
|
2019-02-25 19:40:59 +02:00
|
|
|
return 0;
|
2015-04-15 16:52:29 -07:00
|
|
|
|
2015-05-05 17:06:25 +03:00
|
|
|
return val & (VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2014-11-05 14:26:08 -08:00
|
|
|
}
|
|
|
|
|
2020-12-01 02:17:25 +05:30
|
|
|
void hsw_write_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type,
|
|
|
|
const void *frame, ssize_t len)
|
2012-05-10 10:18:02 -03:00
|
|
|
{
|
2018-06-12 12:19:30 +03:00
|
|
|
const u32 *data = frame;
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2016-11-23 15:57:00 +01:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
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 15:33:26 +02:00
|
|
|
i915_reg_t ctl_reg = HSW_TVIDEO_DIP_CTL(cpu_transcoder);
|
2018-11-28 12:26:20 -08:00
|
|
|
int data_size;
|
2013-08-06 20:32:18 +01:00
|
|
|
int i;
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, ctl_reg);
|
2012-05-10 10:18:02 -03:00
|
|
|
|
2019-09-19 22:53:09 +03:00
|
|
|
data_size = hsw_dip_data_size(dev_priv, type);
|
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN_ON(&dev_priv->drm, len > data_size);
|
2018-11-28 12:26:20 -08:00
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val &= ~hsw_infoframe_enable(type);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, ctl_reg, val);
|
2012-05-14 17:12:51 -03:00
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
hsw_dip_data_reg(dev_priv, cpu_transcoder, type, i >> 2),
|
|
|
|
*data);
|
2012-05-14 17:12:51 -03:00
|
|
|
data++;
|
|
|
|
}
|
2012-09-25 13:23:34 -03:00
|
|
|
/* Write every possible data byte to force correct ECC calculation. */
|
2017-10-13 22:40:51 +03:00
|
|
|
for (; i < data_size; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
hsw_dip_data_reg(dev_priv, cpu_transcoder, type, i >> 2),
|
|
|
|
0);
|
2012-05-10 10:18:02 -03:00
|
|
|
|
2021-04-17 17:21:26 -07:00
|
|
|
/* Wa_14013475917 */
|
|
|
|
if (DISPLAY_VER(dev_priv) == 13 && crtc_state->has_psr &&
|
|
|
|
type == DP_SDP_VSC)
|
|
|
|
return;
|
|
|
|
|
2013-08-06 20:32:18 +01:00
|
|
|
val |= hsw_infoframe_enable(type);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, ctl_reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, ctl_reg);
|
2012-05-10 10:18:02 -03:00
|
|
|
}
|
|
|
|
|
2020-12-01 02:17:36 +05:30
|
|
|
void hsw_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
unsigned int type, void *frame, ssize_t len)
|
2019-02-25 19:41:02 +02:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2021-04-17 17:21:25 -07:00
|
|
|
u32 *data = frame;
|
2019-02-25 19:41:02 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4)
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
*data++ = intel_de_read(dev_priv,
|
|
|
|
hsw_dip_data_reg(dev_priv, cpu_transcoder, type, i >> 2));
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
|
2015-11-26 18:27:07 +02:00
|
|
|
const struct intel_crtc_state *pipe_config)
|
2014-11-05 14:26:08 -08:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv,
|
|
|
|
HSW_TVIDEO_DIP_CTL(pipe_config->cpu_transcoder));
|
2019-05-17 21:52:25 +05:30
|
|
|
u32 mask;
|
|
|
|
|
|
|
|
mask = (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
|
|
|
|
VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
|
|
|
|
VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
|
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 10)
|
2019-05-17 21:52:25 +05:30
|
|
|
mask |= VIDEO_DIP_ENABLE_DRM_GLK;
|
2014-11-05 14:26:08 -08:00
|
|
|
|
2019-05-17 21:52:25 +05:30
|
|
|
return val & mask;
|
2014-11-05 14:26:08 -08:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
static const u8 infoframe_type_to_idx[] = {
|
|
|
|
HDMI_PACKET_TYPE_GENERAL_CONTROL,
|
|
|
|
HDMI_PACKET_TYPE_GAMUT_METADATA,
|
|
|
|
DP_SDP_VSC,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
2019-05-18 16:09:27 +05:30
|
|
|
HDMI_INFOFRAME_TYPE_DRM,
|
2019-02-25 19:40:59 +02:00
|
|
|
};
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
u32 intel_hdmi_infoframe_enable(unsigned int type)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(infoframe_type_to_idx); i++) {
|
|
|
|
if (infoframe_type_to_idx[i] == type)
|
|
|
|
return BIT(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-02-25 19:40:59 +02:00
|
|
|
u32 intel_hdmi_infoframes_enabled(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2019-02-25 19:40:59 +02:00
|
|
|
u32 val, ret = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
val = dig_port->infoframes_enabled(encoder, crtc_state);
|
|
|
|
|
|
|
|
/* map from hardware bits to dip idx */
|
|
|
|
for (i = 0; i < ARRAY_SIZE(infoframe_type_to_idx); i++) {
|
|
|
|
unsigned int type = infoframe_type_to_idx[i];
|
|
|
|
|
|
|
|
if (HAS_DDI(dev_priv)) {
|
|
|
|
if (val & hsw_infoframe_enable(type))
|
|
|
|
ret |= BIT(i);
|
|
|
|
} else {
|
|
|
|
if (val & g4x_infoframe_enable(type))
|
|
|
|
ret |= BIT(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-08-06 20:32:19 +01:00
|
|
|
/*
|
|
|
|
* The data we write to the DIP data buffer registers is 1 byte bigger than the
|
|
|
|
* HDMI infoframe size because of an ECC/reserved byte at position 3 (starting
|
|
|
|
* at 0). It's also a byte used by DisplayPort so the same DIP registers can be
|
|
|
|
* used for both technologies.
|
|
|
|
*
|
|
|
|
* DW0: Reserved/ECC/DP | HB2 | HB1 | HB0
|
|
|
|
* DW1: DB3 | DB2 | DB1 | DB0
|
|
|
|
* DW2: DB7 | DB6 | DB5 | DB4
|
|
|
|
* DW3: ...
|
|
|
|
*
|
|
|
|
* (HB is Header Byte, DB is Data Byte)
|
|
|
|
*
|
|
|
|
* The hdmi pack() functions don't know about that hardware specific hole so we
|
|
|
|
* trick them by giving an offset into the buffer and moving back the header
|
|
|
|
* bytes by one.
|
|
|
|
*/
|
2018-09-20 21:51:36 +03:00
|
|
|
static void intel_write_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2019-02-25 19:41:01 +02:00
|
|
|
enum hdmi_infoframe_type type,
|
|
|
|
const union hdmi_infoframe *frame)
|
2011-08-03 09:22:55 -07:00
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2018-06-12 12:19:30 +03:00
|
|
|
u8 buffer[VIDEO_DIP_DATA_SIZE];
|
2013-08-06 20:32:19 +01:00
|
|
|
ssize_t len;
|
2011-08-03 09:22:55 -07:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
if ((crtc_state->infoframes.enable &
|
|
|
|
intel_hdmi_infoframe_enable(type)) == 0)
|
|
|
|
return;
|
|
|
|
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, frame->any.type != type))
|
2019-02-25 19:41:01 +02:00
|
|
|
return;
|
|
|
|
|
2013-08-06 20:32:19 +01:00
|
|
|
/* see comment above for the reason for this offset */
|
2019-02-25 19:41:01 +02:00
|
|
|
len = hdmi_infoframe_pack_only(frame, buffer + 1, sizeof(buffer) - 1);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, len < 0))
|
2013-08-06 20:32:19 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Insert the 'hole' (see big comment above) at position 3 */
|
2018-09-20 21:51:35 +03:00
|
|
|
memmove(&buffer[0], &buffer[1], 3);
|
2013-08-06 20:32:19 +01:00
|
|
|
buffer[3] = 0;
|
|
|
|
len++;
|
2011-08-03 09:22:55 -07:00
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe(encoder, crtc_state, type, buffer, len);
|
2011-08-03 09:22:55 -07:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
void intel_read_infoframe(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
enum hdmi_infoframe_type type,
|
|
|
|
union hdmi_infoframe *frame)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2019-02-25 19:41:02 +02:00
|
|
|
u8 buffer[VIDEO_DIP_DATA_SIZE];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if ((crtc_state->infoframes.enable &
|
|
|
|
intel_hdmi_infoframe_enable(type)) == 0)
|
|
|
|
return;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->read_infoframe(encoder, crtc_state,
|
2019-02-25 19:41:02 +02:00
|
|
|
type, buffer, sizeof(buffer));
|
|
|
|
|
|
|
|
/* Fill the 'hole' (see big comment above) at position 3 */
|
|
|
|
memmove(&buffer[1], &buffer[0], 3);
|
|
|
|
|
|
|
|
/* see comment above for the reason for this offset */
|
|
|
|
ret = hdmi_infoframe_unpack(frame, buffer + 1, sizeof(buffer) - 1);
|
|
|
|
if (ret) {
|
2020-03-26 08:28:38 +00:00
|
|
|
drm_dbg_kms(encoder->base.dev,
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
"Failed to unpack infoframe type 0x%02x\n", type);
|
2019-02-25 19:41:02 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (frame->any.type != type)
|
2020-03-26 08:28:38 +00:00
|
|
|
drm_dbg_kms(encoder->base.dev,
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
"Found the wrong infoframe type 0x%x (expected 0x%02x)\n",
|
|
|
|
frame->any.type, type);
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
static bool
|
|
|
|
intel_hdmi_compute_avi_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
2011-08-03 09:22:55 -07:00
|
|
|
{
|
2019-02-25 19:41:01 +02:00
|
|
|
struct hdmi_avi_infoframe *frame = &crtc_state->infoframes.avi.avi;
|
2017-01-11 14:57:24 +02:00
|
|
|
const struct drm_display_mode *adjusted_mode =
|
2019-10-31 12:26:02 +01:00
|
|
|
&crtc_state->hw.adjusted_mode;
|
2019-02-25 19:41:01 +02:00
|
|
|
struct drm_connector *connector = conn_state->connector;
|
2013-08-06 20:32:19 +01:00
|
|
|
int ret;
|
2011-08-03 09:22:55 -07:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
if (!crtc_state->has_infoframe)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
crtc_state->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI);
|
|
|
|
|
|
|
|
ret = drm_hdmi_avi_infoframe_from_display_mode(frame, connector,
|
2019-01-08 19:28:25 +02:00
|
|
|
adjusted_mode);
|
2019-02-25 19:41:01 +02:00
|
|
|
if (ret)
|
|
|
|
return false;
|
2012-04-13 16:31:41 -03:00
|
|
|
|
2018-10-12 11:53:08 +05:30
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)
|
2019-02-25 19:41:01 +02:00
|
|
|
frame->colorspace = HDMI_COLORSPACE_YUV420;
|
2018-10-12 11:53:09 +05:30
|
|
|
else if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)
|
2019-02-25 19:41:01 +02:00
|
|
|
frame->colorspace = HDMI_COLORSPACE_YUV444;
|
2017-07-21 20:55:08 +05:30
|
|
|
else
|
2019-02-25 19:41:01 +02:00
|
|
|
frame->colorspace = HDMI_COLORSPACE_RGB;
|
2017-07-21 20:55:08 +05:30
|
|
|
|
2019-03-27 18:23:53 +02:00
|
|
|
drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
|
2017-07-21 20:55:08 +05:30
|
|
|
|
2019-07-18 19:45:23 +03:00
|
|
|
/* nonsense combination */
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
|
|
|
|
crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB);
|
2019-07-18 19:45:23 +03:00
|
|
|
|
2019-07-18 17:50:44 +03:00
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_RGB) {
|
|
|
|
drm_hdmi_avi_infoframe_quant_range(frame, connector,
|
|
|
|
adjusted_mode,
|
|
|
|
crtc_state->limited_color_range ?
|
|
|
|
HDMI_QUANTIZATION_RANGE_LIMITED :
|
|
|
|
HDMI_QUANTIZATION_RANGE_FULL);
|
|
|
|
} else {
|
|
|
|
frame->quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT;
|
|
|
|
frame->ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
|
|
|
|
}
|
2013-01-17 16:31:31 +02:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
drm_hdmi_avi_infoframe_content_type(frame, conn_state);
|
2018-05-15 16:59:28 +03:00
|
|
|
|
2017-07-21 20:55:08 +05:30
|
|
|
/* TODO: handle pixel repetition for YCBCR420 outputs */
|
2019-02-25 19:41:01 +02:00
|
|
|
|
|
|
|
ret = hdmi_avi_infoframe_check(frame);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, ret))
|
2019-02-25 19:41:01 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
2011-07-08 11:31:57 -07:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
static bool
|
|
|
|
intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
2011-08-03 09:22:56 -07:00
|
|
|
{
|
2019-02-25 19:41:01 +02:00
|
|
|
struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
|
2013-08-06 20:32:19 +01:00
|
|
|
int ret;
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
if (!crtc_state->has_infoframe)
|
|
|
|
return true;
|
2011-08-03 09:22:56 -07:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
crtc_state->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
|
2011-08-03 09:22:56 -07:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, ret))
|
2019-02-25 19:41:01 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
frame->sdi = HDMI_SPD_SDI_PC;
|
|
|
|
|
|
|
|
ret = hdmi_spd_infoframe_check(frame);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, ret))
|
2019-02-25 19:41:01 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
2011-08-03 09:22:56 -07:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
static bool
|
|
|
|
intel_hdmi_compute_hdmi_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct hdmi_vendor_infoframe *frame =
|
|
|
|
&crtc_state->infoframes.hdmi.vendor.hdmi;
|
|
|
|
const struct drm_display_info *info =
|
|
|
|
&conn_state->connector->display_info;
|
2013-08-19 16:59:04 +01:00
|
|
|
int ret;
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
if (!crtc_state->has_infoframe || !info->has_hdmi_infoframe)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
crtc_state->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_VENDOR);
|
|
|
|
|
|
|
|
ret = drm_hdmi_vendor_infoframe_from_display_mode(frame,
|
2017-11-13 19:04:19 +02:00
|
|
|
conn_state->connector,
|
2019-10-31 12:26:02 +01:00
|
|
|
&crtc_state->hw.adjusted_mode);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, ret))
|
2019-02-25 19:41:01 +02:00
|
|
|
return false;
|
2013-08-19 16:59:04 +01:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
ret = hdmi_vendor_infoframe_check(frame);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_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 intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
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/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 09:14:48 +05:30
|
|
|
if (drm_WARN_ON(encoder->base.dev, ret))
|
2019-02-25 19:41:01 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
2013-08-19 16:59:04 +01:00
|
|
|
}
|
|
|
|
|
2019-05-18 16:09:27 +05:30
|
|
|
static bool
|
|
|
|
intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
int ret;
|
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) < 10)
|
2019-05-18 16:09:27 +05:30
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!crtc_state->has_infoframe)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!conn_state->hdr_output_metadata)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
crtc_state->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
|
|
|
|
|
|
|
|
ret = drm_hdmi_infoframe_set_hdr_metadata(frame, conn_state);
|
|
|
|
if (ret < 0) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"couldn't set HDR metadata in infoframe\n");
|
2019-05-18 16:09:27 +05:30
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = hdmi_drm_infoframe_check(frame);
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
if (drm_WARN_ON(&dev_priv->drm, ret))
|
2019-05-18 16:09:27 +05:30
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void g4x_set_infoframes(struct intel_encoder *encoder,
|
2014-04-24 23:54:47 +02:00
|
|
|
bool enable,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-28 16:42:48 -03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
|
|
|
struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
|
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 15:33:26 +02:00
|
|
|
i915_reg_t reg = VIDEO_DIP_CTL;
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
2018-09-20 21:51:36 +03:00
|
|
|
u32 port = VIDEO_DIP_PORT(encoder->port);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
|
2012-06-12 16:36:45 +02:00
|
|
|
assert_hdmi_port_disabled(intel_hdmi);
|
|
|
|
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
/* If the registers were not initialized yet, they might be zeroes,
|
|
|
|
* which means we're selecting the AVI DIP and we're setting its
|
|
|
|
* frequency to once. This seems to really confuse the HW and make
|
|
|
|
* things stop working (the register spec says the AVI always needs to
|
|
|
|
* be sent every VSync). So here we avoid writing to the register more
|
|
|
|
* than we need and also explicitly select the AVI DIP and explicitly
|
|
|
|
* set its frequency to every VSync. Avoiding to write it twice seems to
|
|
|
|
* be enough to solve the problem, but being defensive shouldn't hurt us
|
|
|
|
* either. */
|
|
|
|
val |= VIDEO_DIP_SELECT_AVI | VIDEO_DIP_FREQ_VSYNC;
|
|
|
|
|
2014-04-24 23:54:47 +02:00
|
|
|
if (!enable) {
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
if (!(val & VIDEO_DIP_ENABLE))
|
|
|
|
return;
|
2015-05-05 17:06:24 +03:00
|
|
|
if (port != (val & VIDEO_DIP_PORT_MASK)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"video DIP still enabled on port %c\n",
|
|
|
|
(val & VIDEO_DIP_PORT_MASK) >> 29);
|
2015-05-05 17:06:24 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:54 -03:00
|
|
|
if (port != (val & VIDEO_DIP_PORT_MASK)) {
|
|
|
|
if (val & VIDEO_DIP_ENABLE) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"video DIP already enabled on port %c\n",
|
|
|
|
(val & VIDEO_DIP_PORT_MASK) >> 29);
|
2015-05-05 17:06:24 +03:00
|
|
|
return;
|
2012-05-28 16:42:54 -03:00
|
|
|
}
|
|
|
|
val &= ~VIDEO_DIP_PORT_MASK;
|
|
|
|
val |= port;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:51 -03:00
|
|
|
val |= VIDEO_DIP_ENABLE;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-28 16:42:50 -03:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&crtc_state->infoframes.avi);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&crtc_state->infoframes.spd);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&crtc_state->infoframes.hdmi);
|
2012-05-28 16:42:48 -03:00
|
|
|
}
|
|
|
|
|
2015-05-05 17:06:21 +03:00
|
|
|
/*
|
|
|
|
* Determine if default_phase=1 can be indicated in the GCP infoframe.
|
|
|
|
*
|
|
|
|
* From HDMI specification 1.4a:
|
|
|
|
* - The first pixel of each Video Data Period shall always have a pixel packing phase of 0
|
|
|
|
* - The first pixel following each Video Data Period shall have a pixel packing phase of 0
|
|
|
|
* - The PP bits shall be constant for all GCPs and will be equal to the last packing phase
|
|
|
|
* - The first pixel following every transition of HSYNC or VSYNC shall have a pixel packing
|
|
|
|
* phase of 0
|
|
|
|
*/
|
|
|
|
static bool gcp_default_phase_possible(int pipe_bpp,
|
|
|
|
const struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
unsigned int pixels_per_group;
|
|
|
|
|
|
|
|
switch (pipe_bpp) {
|
|
|
|
case 30:
|
|
|
|
/* 4 pixels in 5 clocks */
|
|
|
|
pixels_per_group = 4;
|
|
|
|
break;
|
|
|
|
case 36:
|
|
|
|
/* 2 pixels in 3 clocks */
|
|
|
|
pixels_per_group = 2;
|
|
|
|
break;
|
|
|
|
case 48:
|
|
|
|
/* 1 pixel in 2 clocks */
|
|
|
|
pixels_per_group = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* phase information not relevant for 8bpc */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mode->crtc_hdisplay % pixels_per_group == 0 &&
|
|
|
|
mode->crtc_htotal % pixels_per_group == 0 &&
|
|
|
|
mode->crtc_hblank_start % pixels_per_group == 0 &&
|
|
|
|
mode->crtc_hblank_end % pixels_per_group == 0 &&
|
|
|
|
mode->crtc_hsync_start % pixels_per_group == 0 &&
|
|
|
|
mode->crtc_hsync_end % pixels_per_group == 0 &&
|
|
|
|
((mode->flags & DRM_MODE_FLAG_INTERLACE) == 0 ||
|
|
|
|
mode->crtc_htotal/2 % pixels_per_group == 0);
|
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static bool intel_hdmi_set_gcp_infoframe(struct intel_encoder *encoder,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2015-05-05 17:06:20 +03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
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 15:33:26 +02:00
|
|
|
i915_reg_t reg;
|
2019-02-25 19:41:01 +02:00
|
|
|
|
|
|
|
if ((crtc_state->infoframes.enable &
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GENERAL_CONTROL)) == 0)
|
|
|
|
return false;
|
2015-05-05 17:06:20 +03:00
|
|
|
|
|
|
|
if (HAS_DDI(dev_priv))
|
2016-11-23 15:57:00 +01:00
|
|
|
reg = HSW_TVIDEO_DIP_GCP(crtc_state->cpu_transcoder);
|
2015-12-09 12:29:35 -08:00
|
|
|
else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
|
2015-05-05 17:06:20 +03:00
|
|
|
reg = VLV_TVIDEO_DIP_GCP(crtc->pipe);
|
2016-04-07 11:08:05 +03:00
|
|
|
else if (HAS_PCH_SPLIT(dev_priv))
|
2015-05-05 17:06:20 +03:00
|
|
|
reg = TVIDEO_DIP_GCP(crtc->pipe);
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, crtc_state->infoframes.gcp);
|
2019-02-25 19:41:01 +02:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:02 +02:00
|
|
|
void intel_hdmi_read_gcp_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:03 +01:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-02-25 19:41:02 +02:00
|
|
|
i915_reg_t reg;
|
|
|
|
|
|
|
|
if ((crtc_state->infoframes.enable &
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GENERAL_CONTROL)) == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (HAS_DDI(dev_priv))
|
|
|
|
reg = HSW_TVIDEO_DIP_GCP(crtc_state->cpu_transcoder);
|
|
|
|
else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
|
|
|
|
reg = VLV_TVIDEO_DIP_GCP(crtc->pipe);
|
|
|
|
else if (HAS_PCH_SPLIT(dev_priv))
|
|
|
|
reg = TVIDEO_DIP_GCP(crtc->pipe);
|
|
|
|
else
|
|
|
|
return;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
crtc_state->infoframes.gcp = intel_de_read(dev_priv, reg);
|
2019-02-25 19:41:02 +02:00
|
|
|
}
|
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
static void intel_hdmi_compute_gcp_infoframe(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
|
|
|
if (IS_G4X(dev_priv) || !crtc_state->has_infoframe)
|
|
|
|
return;
|
|
|
|
|
|
|
|
crtc_state->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframe_enable(HDMI_PACKET_TYPE_GENERAL_CONTROL);
|
|
|
|
|
2019-04-29 16:08:11 -07:00
|
|
|
/* Indicate color indication for deep color mode */
|
|
|
|
if (crtc_state->pipe_bpp > 24)
|
2019-02-25 19:41:01 +02:00
|
|
|
crtc_state->infoframes.gcp |= GCP_COLOR_INDICATION;
|
2015-05-05 17:06:20 +03:00
|
|
|
|
2015-05-05 17:06:21 +03:00
|
|
|
/* Enable default_phase whenever the display mode is suitably aligned */
|
2016-11-23 15:57:00 +01:00
|
|
|
if (gcp_default_phase_possible(crtc_state->pipe_bpp,
|
2019-10-31 12:26:02 +01:00
|
|
|
&crtc_state->hw.adjusted_mode))
|
2019-02-25 19:41:01 +02:00
|
|
|
crtc_state->infoframes.gcp |= GCP_DEFAULT_PHASE_ENABLE;
|
2015-05-05 17:06:20 +03:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void ibx_set_infoframes(struct intel_encoder *encoder,
|
2014-04-24 23:54:47 +02:00
|
|
|
bool enable,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-28 16:42:48 -03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
|
|
|
struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
|
2021-06-09 11:56:32 +03:00
|
|
|
i915_reg_t reg = TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
2018-09-20 21:51:36 +03:00
|
|
|
u32 port = VIDEO_DIP_PORT(encoder->port);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
|
2012-06-12 16:36:45 +02:00
|
|
|
assert_hdmi_port_disabled(intel_hdmi);
|
|
|
|
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
/* See the big comment in g4x_set_infoframes() */
|
|
|
|
val |= VIDEO_DIP_SELECT_AVI | VIDEO_DIP_FREQ_VSYNC;
|
|
|
|
|
2014-04-24 23:54:47 +02:00
|
|
|
if (!enable) {
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
if (!(val & VIDEO_DIP_ENABLE))
|
|
|
|
return;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:54 -03:00
|
|
|
if (port != (val & VIDEO_DIP_PORT_MASK)) {
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, val & VIDEO_DIP_ENABLE,
|
|
|
|
"DIP already enabled on port %c\n",
|
|
|
|
(val & VIDEO_DIP_PORT_MASK) >> 29);
|
2012-05-28 16:42:54 -03:00
|
|
|
val &= ~VIDEO_DIP_PORT_MASK;
|
|
|
|
val |= port;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:51 -03:00
|
|
|
val |= VIDEO_DIP_ENABLE;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2016-11-23 15:57:00 +01:00
|
|
|
if (intel_hdmi_set_gcp_infoframe(encoder, crtc_state, conn_state))
|
2015-05-05 17:06:20 +03:00
|
|
|
val |= VIDEO_DIP_ENABLE_GCP;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-28 16:42:50 -03:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&crtc_state->infoframes.avi);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&crtc_state->infoframes.spd);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&crtc_state->infoframes.hdmi);
|
2012-05-28 16:42:48 -03:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void cpt_set_infoframes(struct intel_encoder *encoder,
|
2014-04-24 23:54:47 +02:00
|
|
|
bool enable,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-28 16:42:48 -03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
2021-06-09 11:56:32 +03:00
|
|
|
i915_reg_t reg = TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
|
2012-06-12 16:36:45 +02:00
|
|
|
assert_hdmi_port_disabled(intel_hdmi);
|
|
|
|
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
/* See the big comment in g4x_set_infoframes() */
|
|
|
|
val |= VIDEO_DIP_SELECT_AVI | VIDEO_DIP_FREQ_VSYNC;
|
|
|
|
|
2014-04-24 23:54:47 +02:00
|
|
|
if (!enable) {
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
if (!(val & VIDEO_DIP_ENABLE))
|
|
|
|
return;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:51 -03:00
|
|
|
/* Set both together, unset both together: see the spec. */
|
|
|
|
val |= VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI;
|
2012-05-28 16:42:53 -03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
2015-05-05 17:06:24 +03:00
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2016-11-23 15:57:00 +01:00
|
|
|
if (intel_hdmi_set_gcp_infoframe(encoder, crtc_state, conn_state))
|
2015-05-05 17:06:20 +03:00
|
|
|
val |= VIDEO_DIP_ENABLE_GCP;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&crtc_state->infoframes.avi);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&crtc_state->infoframes.spd);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&crtc_state->infoframes.hdmi);
|
2012-05-28 16:42:48 -03:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void vlv_set_infoframes(struct intel_encoder *encoder,
|
2014-04-24 23:54:47 +02:00
|
|
|
bool enable,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-28 16:42:48 -03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
2021-06-09 11:56:32 +03:00
|
|
|
i915_reg_t reg = VLV_TVIDEO_DIP_CTL(crtc->pipe);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
2018-09-20 21:51:36 +03:00
|
|
|
u32 port = VIDEO_DIP_PORT(encoder->port);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
|
2012-06-12 16:36:45 +02:00
|
|
|
assert_hdmi_port_disabled(intel_hdmi);
|
|
|
|
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
/* See the big comment in g4x_set_infoframes() */
|
|
|
|
val |= VIDEO_DIP_SELECT_AVI | VIDEO_DIP_FREQ_VSYNC;
|
|
|
|
|
2014-04-24 23:54:47 +02:00
|
|
|
if (!enable) {
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
if (!(val & VIDEO_DIP_ENABLE))
|
|
|
|
return;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-04-02 10:08:51 -07:00
|
|
|
if (port != (val & VIDEO_DIP_PORT_MASK)) {
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, val & VIDEO_DIP_ENABLE,
|
|
|
|
"DIP already enabled on port %c\n",
|
|
|
|
(val & VIDEO_DIP_PORT_MASK) >> 29);
|
2014-04-02 10:08:51 -07:00
|
|
|
val &= ~VIDEO_DIP_PORT_MASK;
|
|
|
|
val |= port;
|
|
|
|
}
|
|
|
|
|
2012-05-28 16:42:51 -03:00
|
|
|
val |= VIDEO_DIP_ENABLE;
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE_AVI |
|
|
|
|
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
|
|
|
|
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2016-11-23 15:57:00 +01:00
|
|
|
if (intel_hdmi_set_gcp_infoframe(encoder, crtc_state, conn_state))
|
2015-05-05 17:06:20 +03:00
|
|
|
val |= VIDEO_DIP_ENABLE_GCP;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-28 16:42:51 -03:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&crtc_state->infoframes.avi);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&crtc_state->infoframes.spd);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&crtc_state->infoframes.hdmi);
|
2012-05-28 16:42:48 -03:00
|
|
|
}
|
|
|
|
|
2018-09-20 21:51:36 +03:00
|
|
|
static void hsw_set_infoframes(struct intel_encoder *encoder,
|
2014-04-24 23:54:47 +02:00
|
|
|
bool enable,
|
2016-11-23 15:57:00 +01:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-28 16:42:48 -03:00
|
|
|
{
|
2018-09-20 21:51:36 +03:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2016-11-23 15:57:00 +01:00
|
|
|
i915_reg_t reg = HSW_TVIDEO_DIP_CTL(crtc_state->cpu_transcoder);
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 val = intel_de_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
|
2018-06-13 20:07:08 +03:00
|
|
|
assert_hdmi_transcoder_func_disabled(dev_priv,
|
|
|
|
crtc_state->cpu_transcoder);
|
2012-06-12 16:36:45 +02:00
|
|
|
|
2015-05-05 17:06:24 +03:00
|
|
|
val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
|
|
|
|
VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
|
2019-05-17 21:52:25 +05:30
|
|
|
VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
|
|
|
|
VIDEO_DIP_ENABLE_DRM_GLK);
|
2015-05-05 17:06:24 +03:00
|
|
|
|
2014-04-24 23:54:47 +02:00
|
|
|
if (!enable) {
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
drm/i915: properly alternate between DVI and HDMI
This solves problems that happen when you alternate between HDMI and
DVI on the same port. I can reproduce these problems using DP->HDMI
and DP->DVI adapters on a DP port.
When you first plug HDMI and then plug DVI, you need to stop sending
DIPs, even if the port is in DVI mode (see the HDMI register spec). If
you don't stop sending DIPs, you'll see a pink vertical line on the
left side of the screen, some modes will give you a black screen, some
modes won't work correctly.
When you first plug DVI and then plug HDMI, you need to properly
enable the DIPs, otherwise the HW won't send them. After spending a
lot of time investigating this, I concluded that if the DIPs are
disabled, we should not write to the DIP register again because when
we do this, we also set the AVI InfoFrame frequency to "once", and
this seems to really confuse our hardware. Since this problem was not
exactly easy to debug, I'm adopting the defensive behavior and not
just avoing the "disable twice" sequence, but also explicitly
selecting the AVI InfoFrame and setting its frequency to a correct
one.
Also, move the "is_dvi" check from intel_set_infoframe to the
set_infoframes functions since now they're going to be the first ones
to deal with the DIP registers.
This patch adds the code to fix the problem, but it depends on the
removal of some code that can't be removed right now and will come
later in the patch series. The patch that we need is:
- drm/i915: don't write 0 to DIP control at HDMI init
[danvet: Paulo clarified that this additional patch is only required
to make the fix complete, this patch here alone doesn't introduce a
regression but only partially solves the problem of randomly clearing
the dip registers.]
V2: Be even more defensive by selecting AVI and setting its frequency
outside the "is_dvi" check.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-05-28 16:42:49 -03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-11-23 15:57:00 +01:00
|
|
|
if (intel_hdmi_set_gcp_infoframe(encoder, crtc_state, conn_state))
|
2015-05-05 17:06:20 +03:00
|
|
|
val |= VIDEO_DIP_ENABLE_GCP_HSW;
|
|
|
|
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2012-05-28 16:42:53 -03:00
|
|
|
|
2019-02-25 19:41:01 +02:00
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&crtc_state->infoframes.avi);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&crtc_state->infoframes.spd);
|
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&crtc_state->infoframes.hdmi);
|
2019-05-18 16:09:27 +05:30
|
|
|
intel_write_infoframe(encoder, crtc_state,
|
|
|
|
HDMI_INFOFRAME_TYPE_DRM,
|
|
|
|
&crtc_state->infoframes.drm);
|
2012-05-28 16:42:48 -03:00
|
|
|
}
|
|
|
|
|
2016-05-02 22:08:24 +03:00
|
|
|
void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(intel_hdmi_to_dev(hdmi));
|
|
|
|
struct i2c_adapter *adapter =
|
|
|
|
intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
|
|
|
|
|
|
|
|
if (hdmi->dp_dual_mode.type < DRM_DP_DUAL_MODE_TYPE2_DVI)
|
|
|
|
return;
|
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "%s DP dual mode adaptor TMDS output\n",
|
|
|
|
enable ? "Enabling" : "Disabling");
|
2016-05-02 22:08:24 +03:00
|
|
|
|
2021-04-23 14:43:01 -04:00
|
|
|
drm_dp_dual_mode_set_tmds_output(&dev_priv->drm, hdmi->dp_dual_mode.type, adapter, enable);
|
2016-05-02 22:08:24 +03:00
|
|
|
}
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
static int intel_hdmi_hdcp_read(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
unsigned int offset, void *buffer, size_t size)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
struct intel_hdmi *hdmi = &dig_port->hdmi;
|
2020-02-11 15:44:27 +02:00
|
|
|
struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
|
2018-01-08 14:55:42 -05:00
|
|
|
hdmi->ddc_bus);
|
|
|
|
int ret;
|
|
|
|
u8 start = offset & 0xff;
|
|
|
|
struct i2c_msg msgs[] = {
|
|
|
|
{
|
|
|
|
.addr = DRM_HDCP_DDC_ADDR,
|
|
|
|
.flags = 0,
|
|
|
|
.len = 1,
|
|
|
|
.buf = &start,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.addr = DRM_HDCP_DDC_ADDR,
|
|
|
|
.flags = I2C_M_RD,
|
|
|
|
.len = size,
|
|
|
|
.buf = buffer
|
|
|
|
}
|
|
|
|
};
|
|
|
|
ret = i2c_transfer(adapter, msgs, ARRAY_SIZE(msgs));
|
|
|
|
if (ret == ARRAY_SIZE(msgs))
|
|
|
|
return 0;
|
|
|
|
return ret >= 0 ? -EIO : ret;
|
|
|
|
}
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
static int intel_hdmi_hdcp_write(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
unsigned int offset, void *buffer, size_t size)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
struct intel_hdmi *hdmi = &dig_port->hdmi;
|
2020-02-11 15:44:27 +02:00
|
|
|
struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
|
2018-01-08 14:55:42 -05:00
|
|
|
hdmi->ddc_bus);
|
|
|
|
int ret;
|
|
|
|
u8 *write_buf;
|
|
|
|
struct i2c_msg msg;
|
|
|
|
|
|
|
|
write_buf = kzalloc(size + 1, GFP_KERNEL);
|
|
|
|
if (!write_buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
write_buf[0] = offset & 0xff;
|
|
|
|
memcpy(&write_buf[1], buffer, size);
|
|
|
|
|
|
|
|
msg.addr = DRM_HDCP_DDC_ADDR;
|
|
|
|
msg.flags = 0,
|
|
|
|
msg.len = size + 1,
|
|
|
|
msg.buf = write_buf;
|
|
|
|
|
|
|
|
ret = i2c_transfer(adapter, &msg, 1);
|
|
|
|
if (ret == 1)
|
2018-08-23 13:51:36 -07:00
|
|
|
ret = 0;
|
|
|
|
else if (ret >= 0)
|
|
|
|
ret = -EIO;
|
|
|
|
|
|
|
|
kfree(write_buf);
|
|
|
|
return ret;
|
2018-01-08 14:55:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
u8 *an)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
struct intel_hdmi *hdmi = &dig_port->hdmi;
|
2020-02-11 15:44:27 +02:00
|
|
|
struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
|
2018-01-08 14:55:42 -05:00
|
|
|
hdmi->ddc_bus);
|
|
|
|
int ret;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_write(dig_port, DRM_HDCP_DDC_AN, an,
|
2018-01-08 14:55:42 -05:00
|
|
|
DRM_HDCP_AN_LEN);
|
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Write An over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = intel_gmbus_output_aksv(adapter);
|
|
|
|
if (ret < 0) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Failed to output aksv (%d)\n", ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
static int intel_hdmi_hdcp_read_bksv(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
u8 *bksv)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_BKSV, bksv,
|
2018-01-08 14:55:42 -05:00
|
|
|
DRM_HDCP_KSV_LEN);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read Bksv over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_read_bstatus(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
u8 *bstatus)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_BSTATUS,
|
2018-01-08 14:55:42 -05:00
|
|
|
bstatus, DRM_HDCP_BSTATUS_LEN);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read bstatus over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_repeater_present(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
bool *repeater_present)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
|
|
|
u8 val;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_BCAPS, &val, 1);
|
2018-01-08 14:55:42 -05:00
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read bcaps over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
*repeater_present = val & DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_read_ri_prime(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
u8 *ri_prime)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_RI_PRIME,
|
2018-01-08 14:55:42 -05:00
|
|
|
ri_prime, DRM_HDCP_RI_LEN);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read Ri' over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_read_ksv_ready(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
bool *ksv_ready)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
|
|
|
u8 val;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_BCAPS, &val, 1);
|
2018-01-08 14:55:42 -05:00
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read bcaps over DDC failed (%d)\n",
|
|
|
|
ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
*ksv_ready = val & DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_read_ksv_fifo(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
int num_downstream, u8 *ksv_fifo)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_KSV_FIFO,
|
2018-01-08 14:55:42 -05:00
|
|
|
ksv_fifo, num_downstream * DRM_HDCP_KSV_LEN);
|
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"Read ksv fifo over DDC failed (%d)\n", ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_read_v_prime_part(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
int i, u32 *part)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (i >= DRM_HDCP_V_PRIME_NUM_PARTS)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, DRM_HDCP_DDC_V_PRIME(i),
|
2018-01-08 14:55:42 -05:00
|
|
|
part, DRM_HDCP_V_PRIME_PART_LEN);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Read V'[%d] over DDC failed (%d)\n",
|
|
|
|
i, ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-08-18 11:38:53 -04:00
|
|
|
static int kbl_repositioning_enc_en_signal(struct intel_connector *connector,
|
|
|
|
enum transcoder cpu_transcoder)
|
2019-02-16 23:07:03 +05:30
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2021-06-09 11:56:32 +03:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(connector->base.state->crtc);
|
2019-02-16 23:07:03 +05:30
|
|
|
u32 scanline;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
for (;;) {
|
2021-06-09 11:56:32 +03:00
|
|
|
scanline = intel_de_read(dev_priv, PIPEDSL(crtc->pipe));
|
2019-02-16 23:07:03 +05:30
|
|
|
if (scanline > 100 && scanline < 200)
|
|
|
|
break;
|
|
|
|
usleep_range(25, 50);
|
|
|
|
}
|
|
|
|
|
2021-01-11 13:41:08 +05:30
|
|
|
ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, cpu_transcoder,
|
|
|
|
false, TRANS_DDI_HDCP_SIGNALLING);
|
2019-02-16 23:07:03 +05:30
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Disable HDCP signalling failed (%d)\n", ret);
|
2019-02-16 23:07:03 +05:30
|
|
|
return ret;
|
|
|
|
}
|
2021-01-11 13:41:08 +05:30
|
|
|
|
|
|
|
ret = intel_ddi_toggle_hdcp_bits(&dig_port->base, cpu_transcoder,
|
|
|
|
true, TRANS_DDI_HDCP_SIGNALLING);
|
2019-02-16 23:07:03 +05:30
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Enable HDCP signalling failed (%d)\n", ret);
|
2019-02-16 23:07:03 +05:30
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *dig_port,
|
2020-08-18 11:38:53 -04:00
|
|
|
enum transcoder cpu_transcoder,
|
2018-01-08 14:55:42 -05:00
|
|
|
bool enable)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_hdmi *hdmi = &dig_port->hdmi;
|
2019-02-16 23:07:03 +05:30
|
|
|
struct intel_connector *connector = hdmi->attached_connector;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!enable)
|
|
|
|
usleep_range(6, 60); /* Bspec says >= 6us */
|
|
|
|
|
2021-01-11 13:41:08 +05:30
|
|
|
ret = intel_ddi_toggle_hdcp_bits(&dig_port->base,
|
|
|
|
cpu_transcoder, enable,
|
|
|
|
TRANS_DDI_HDCP_SIGNALLING);
|
2018-01-08 14:55:42 -05:00
|
|
|
if (ret) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_err(&dev_priv->drm, "%s HDCP signalling failed (%d)\n",
|
|
|
|
enable ? "Enable" : "Disable", ret);
|
2018-01-08 14:55:42 -05:00
|
|
|
return ret;
|
|
|
|
}
|
2019-02-16 23:07:03 +05:30
|
|
|
|
|
|
|
/*
|
|
|
|
* WA: To fix incorrect positioning of the window of
|
|
|
|
* opportunity and enc_en signalling in KABYLAKE.
|
|
|
|
*/
|
|
|
|
if (IS_KABYLAKE(dev_priv) && enable)
|
2020-08-18 11:38:53 -04:00
|
|
|
return kbl_repositioning_enc_en_signal(connector,
|
|
|
|
cpu_transcoder);
|
2019-02-16 23:07:03 +05:30
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-08-18 11:39:02 -04:00
|
|
|
bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port,
|
|
|
|
struct intel_connector *connector)
|
2018-01-08 14:55:42 -05:00
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;
|
2018-01-08 14:55:42 -05:00
|
|
|
int ret;
|
|
|
|
union {
|
|
|
|
u32 reg;
|
|
|
|
u8 shim[DRM_HDCP_RI_LEN];
|
|
|
|
} ri;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read_ri_prime(dig_port, ri.shim);
|
2018-01-08 14:55:42 -05:00
|
|
|
if (ret)
|
|
|
|
return false;
|
|
|
|
|
2020-02-11 15:44:27 +02:00
|
|
|
intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
|
2018-01-08 14:55:42 -05:00
|
|
|
|
|
|
|
/* Wait for Ri prime match */
|
2020-03-28 11:41:00 +01:00
|
|
|
if (wait_for((intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
|
|
|
|
(HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) ==
|
2018-01-08 14:55:42 -05:00
|
|
|
(HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
|
2020-05-04 14:35:24 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Ri' mismatch detected (%x)\n",
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder,
|
|
|
|
port)));
|
2018-01-08 14:55:42 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-05-04 14:35:24 +02:00
|
|
|
static
|
2020-08-18 11:39:02 -04:00
|
|
|
bool intel_hdmi_hdcp_check_link(struct intel_digital_port *dig_port,
|
|
|
|
struct intel_connector *connector)
|
2020-05-04 14:35:24 +02:00
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2020-05-04 14:35:24 +02:00
|
|
|
int retry;
|
|
|
|
|
|
|
|
for (retry = 0; retry < 3; retry++)
|
2020-08-18 11:39:02 -04:00
|
|
|
if (intel_hdmi_hdcp_check_link_once(dig_port, connector))
|
2020-05-04 14:35:24 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
drm_err(&i915->drm, "Link check failed\n");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2019-10-10 17:51:24 +03:00
|
|
|
struct hdcp2_hdmi_msg_timeout {
|
2019-02-16 23:07:01 +05:30
|
|
|
u8 msg_id;
|
2019-10-10 17:51:27 +03:00
|
|
|
u16 timeout;
|
2019-08-20 16:40:18 +03:00
|
|
|
};
|
|
|
|
|
2019-10-10 17:51:24 +03:00
|
|
|
static const struct hdcp2_hdmi_msg_timeout hdcp2_msg_timeout[] = {
|
2019-10-10 17:51:26 +03:00
|
|
|
{ HDCP_2_2_AKE_SEND_CERT, HDCP_2_2_CERT_TIMEOUT_MS, },
|
|
|
|
{ HDCP_2_2_AKE_SEND_PAIRING_INFO, HDCP_2_2_PAIRING_TIMEOUT_MS, },
|
|
|
|
{ HDCP_2_2_LC_SEND_LPRIME, HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS, },
|
|
|
|
{ HDCP_2_2_REP_SEND_RECVID_LIST, HDCP_2_2_RECVID_LIST_TIMEOUT_MS, },
|
|
|
|
{ HDCP_2_2_REP_STREAM_READY, HDCP_2_2_STREAM_READY_TIMEOUT_MS, },
|
2019-08-20 16:40:18 +03:00
|
|
|
};
|
2019-02-16 23:07:01 +05:30
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp2_read_rx_status(struct intel_digital_port *dig_port,
|
2019-03-18 18:00:19 +02:00
|
|
|
u8 *rx_status)
|
2019-02-16 23:07:01 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
return intel_hdmi_hdcp_read(dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET,
|
|
|
|
rx_status,
|
|
|
|
HDCP_2_2_HDMI_RXSTATUS_LEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_hdcp2_msg_timeout(u8 msg_id, bool is_paired)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2019-10-10 17:51:26 +03:00
|
|
|
if (msg_id == HDCP_2_2_AKE_SEND_HPRIME) {
|
|
|
|
if (is_paired)
|
|
|
|
return HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS;
|
|
|
|
else
|
|
|
|
return HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(hdcp2_msg_timeout); i++) {
|
|
|
|
if (hdcp2_msg_timeout[i].msg_id == msg_id)
|
2019-10-10 17:51:24 +03:00
|
|
|
return hdcp2_msg_timeout[i].timeout;
|
2019-10-10 17:51:26 +03:00
|
|
|
}
|
2019-02-16 23:07:01 +05:30
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static int
|
2020-06-30 21:50:54 -07:00
|
|
|
hdcp2_detect_msg_availability(struct intel_digital_port *dig_port,
|
2020-04-20 17:04:38 +03:00
|
|
|
u8 msg_id, bool *msg_ready,
|
|
|
|
ssize_t *msg_sz)
|
2019-02-16 23:07:01 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2019-02-16 23:07:01 +05:30
|
|
|
u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN];
|
|
|
|
int ret;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp2_read_rx_status(dig_port, rx_status);
|
2019-02-16 23:07:01 +05:30
|
|
|
if (ret < 0) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "rx_status read failed. Err %d\n",
|
|
|
|
ret);
|
2019-02-16 23:07:01 +05:30
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
*msg_sz = ((HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI(rx_status[1]) << 8) |
|
|
|
|
rx_status[0]);
|
|
|
|
|
|
|
|
if (msg_id == HDCP_2_2_REP_SEND_RECVID_LIST)
|
|
|
|
*msg_ready = (HDCP_2_2_HDMI_RXSTATUS_READY(rx_status[1]) &&
|
|
|
|
*msg_sz);
|
|
|
|
else
|
|
|
|
*msg_ready = *msg_sz;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t
|
2020-06-30 21:50:54 -07:00
|
|
|
intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
u8 msg_id, bool paired)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2019-02-16 23:07:01 +05:30
|
|
|
bool msg_ready = false;
|
|
|
|
int timeout, ret;
|
|
|
|
ssize_t msg_sz = 0;
|
|
|
|
|
|
|
|
timeout = get_hdcp2_msg_timeout(msg_id, paired);
|
|
|
|
if (timeout < 0)
|
|
|
|
return timeout;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = __wait_for(ret = hdcp2_detect_msg_availability(dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
msg_id, &msg_ready,
|
|
|
|
&msg_sz),
|
|
|
|
!ret && msg_ready && msg_sz, timeout * 1000,
|
|
|
|
1000, 5 * 1000);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "msg_id: %d, ret: %d, timeout: %d\n",
|
|
|
|
msg_id, ret, timeout);
|
2019-02-16 23:07:01 +05:30
|
|
|
|
|
|
|
return ret ? ret : msg_sz;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp2_write_msg(struct intel_digital_port *dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
void *buf, size_t size)
|
|
|
|
{
|
|
|
|
unsigned int offset;
|
|
|
|
|
|
|
|
offset = HDCP_2_2_HDMI_REG_WR_MSG_OFFSET;
|
2020-06-30 21:50:54 -07:00
|
|
|
return intel_hdmi_hdcp_write(dig_port, offset, buf, size);
|
2019-02-16 23:07:01 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
u8 msg_id, void *buf, size_t size)
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
struct intel_hdmi *hdmi = &dig_port->hdmi;
|
2019-02-16 23:07:01 +05:30
|
|
|
struct intel_hdcp *hdcp = &hdmi->attached_connector->hdcp;
|
|
|
|
unsigned int offset;
|
|
|
|
ssize_t ret;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp2_wait_for_msg(dig_port, msg_id,
|
2019-02-16 23:07:01 +05:30
|
|
|
hdcp->is_paired);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Available msg size should be equal to or lesser than the
|
|
|
|
* available buffer.
|
|
|
|
*/
|
|
|
|
if (ret > size) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"msg_sz(%zd) is more than exp size(%zu)\n",
|
|
|
|
ret, size);
|
2019-02-16 23:07:01 +05:30
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
offset = HDCP_2_2_HDMI_REG_RD_MSG_OFFSET;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, offset, buf, ret);
|
2019-02-16 23:07:01 +05:30
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm, "Failed to read msg_id: %d(%zd)\n",
|
|
|
|
msg_id, ret);
|
2019-02-16 23:07:01 +05:30
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2021-01-11 13:41:16 +05:30
|
|
|
int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port,
|
|
|
|
struct intel_connector *connector)
|
2019-02-16 23:07:01 +05:30
|
|
|
{
|
|
|
|
u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN];
|
|
|
|
int ret;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp2_read_rx_status(dig_port, rx_status);
|
2019-02-16 23:07:01 +05:30
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Re-auth request and Link Integrity Failures are represented by
|
|
|
|
* same bit. i.e reauth_req.
|
|
|
|
*/
|
|
|
|
if (HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ(rx_status[1]))
|
|
|
|
ret = HDCP_REAUTH_REQUEST;
|
|
|
|
else if (HDCP_2_2_HDMI_RXSTATUS_READY(rx_status[1]))
|
|
|
|
ret = HDCP_TOPOLOGY_CHANGE;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdmi_hdcp2_capable(struct intel_digital_port *dig_port,
|
2019-02-16 23:07:01 +05:30
|
|
|
bool *capable)
|
|
|
|
{
|
|
|
|
u8 hdcp2_version;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
*capable = false;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdmi_hdcp_read(dig_port, HDCP_2_2_HDMI_REG_VER_OFFSET,
|
2019-02-16 23:07:01 +05:30
|
|
|
&hdcp2_version, sizeof(hdcp2_version));
|
|
|
|
if (!ret && hdcp2_version & HDCP_2_2_HDMI_SUPPORT_MASK)
|
|
|
|
*capable = true;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-01-08 14:55:42 -05:00
|
|
|
static const struct intel_hdcp_shim intel_hdmi_hdcp_shim = {
|
|
|
|
.write_an_aksv = intel_hdmi_hdcp_write_an_aksv,
|
|
|
|
.read_bksv = intel_hdmi_hdcp_read_bksv,
|
|
|
|
.read_bstatus = intel_hdmi_hdcp_read_bstatus,
|
|
|
|
.repeater_present = intel_hdmi_hdcp_repeater_present,
|
|
|
|
.read_ri_prime = intel_hdmi_hdcp_read_ri_prime,
|
|
|
|
.read_ksv_ready = intel_hdmi_hdcp_read_ksv_ready,
|
|
|
|
.read_ksv_fifo = intel_hdmi_hdcp_read_ksv_fifo,
|
|
|
|
.read_v_prime_part = intel_hdmi_hdcp_read_v_prime_part,
|
|
|
|
.toggle_signalling = intel_hdmi_hdcp_toggle_signalling,
|
|
|
|
.check_link = intel_hdmi_hdcp_check_link,
|
2019-02-16 23:07:01 +05:30
|
|
|
.write_2_2_msg = intel_hdmi_hdcp2_write_msg,
|
|
|
|
.read_2_2_msg = intel_hdmi_hdcp2_read_msg,
|
|
|
|
.check_2_2_link = intel_hdmi_hdcp2_check_link,
|
|
|
|
.hdcp_2_2_capable = intel_hdmi_hdcp2_capable,
|
|
|
|
.protocol = HDCP_PROTOCOL_HDMI,
|
2018-01-08 14:55:42 -05:00
|
|
|
};
|
|
|
|
|
2017-10-30 16:57:02 +02:00
|
|
|
static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
|
2013-07-22 18:02:39 +02:00
|
|
|
{
|
2017-10-30 16:57:02 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-01-17 16:29:21 +02:00
|
|
|
int max_tmds_clock, vbt_max_tmds_clock;
|
2017-10-30 16:57:02 +02:00
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 10)
|
2017-10-30 16:57:02 +02:00
|
|
|
max_tmds_clock = 594000;
|
2021-03-19 21:42:42 -07:00
|
|
|
else if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL(dev_priv))
|
2017-10-30 16:57:02 +02:00
|
|
|
max_tmds_clock = 300000;
|
2021-03-19 21:42:42 -07:00
|
|
|
else if (DISPLAY_VER(dev_priv) >= 5)
|
2017-10-30 16:57:02 +02:00
|
|
|
max_tmds_clock = 225000;
|
2013-07-22 18:02:39 +02:00
|
|
|
else
|
2017-10-30 16:57:02 +02:00
|
|
|
max_tmds_clock = 165000;
|
|
|
|
|
2020-01-17 16:29:21 +02:00
|
|
|
vbt_max_tmds_clock = intel_bios_max_tmds_clock(encoder);
|
|
|
|
if (vbt_max_tmds_clock)
|
|
|
|
max_tmds_clock = min(max_tmds_clock, vbt_max_tmds_clock);
|
2017-10-30 16:57:02 +02:00
|
|
|
|
|
|
|
return max_tmds_clock;
|
2013-07-22 18:02:39 +02:00
|
|
|
}
|
|
|
|
|
2020-01-08 20:12:35 +02:00
|
|
|
static bool intel_has_hdmi_sink(struct intel_hdmi *hdmi,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
return hdmi->has_hdmi_sink &&
|
|
|
|
READ_ONCE(to_intel_digital_connector_state(conn_state)->force_audio) != HDMI_AUDIO_OFF_DVI;
|
|
|
|
}
|
|
|
|
|
2016-05-02 22:08:23 +03:00
|
|
|
static int hdmi_port_clock_limit(struct intel_hdmi *hdmi,
|
2017-05-01 15:38:02 +02:00
|
|
|
bool respect_downstream_limits,
|
2020-01-08 20:12:35 +02:00
|
|
|
bool has_hdmi_sink)
|
2016-05-02 22:08:23 +03:00
|
|
|
{
|
2017-10-30 16:57:02 +02:00
|
|
|
struct intel_encoder *encoder = &hdmi_to_dig_port(hdmi)->base;
|
|
|
|
int max_tmds_clock = intel_hdmi_source_max_tmds_clock(encoder);
|
2016-05-02 22:08:23 +03:00
|
|
|
|
|
|
|
if (respect_downstream_limits) {
|
2016-09-28 16:51:43 +03:00
|
|
|
struct intel_connector *connector = hdmi->attached_connector;
|
|
|
|
const struct drm_display_info *info = &connector->base.display_info;
|
|
|
|
|
2016-05-02 22:08:23 +03:00
|
|
|
if (hdmi->dp_dual_mode.max_tmds_clock)
|
|
|
|
max_tmds_clock = min(max_tmds_clock,
|
|
|
|
hdmi->dp_dual_mode.max_tmds_clock);
|
2016-09-28 16:51:43 +03:00
|
|
|
|
|
|
|
if (info->max_tmds_clock)
|
|
|
|
max_tmds_clock = min(max_tmds_clock,
|
|
|
|
info->max_tmds_clock);
|
2020-01-08 20:12:35 +02:00
|
|
|
else if (!has_hdmi_sink)
|
2016-05-02 22:08:23 +03:00
|
|
|
max_tmds_clock = min(max_tmds_clock, 165000);
|
|
|
|
}
|
|
|
|
|
|
|
|
return max_tmds_clock;
|
|
|
|
}
|
|
|
|
|
2015-06-30 19:23:59 +03:00
|
|
|
static enum drm_mode_status
|
|
|
|
hdmi_port_clock_valid(struct intel_hdmi *hdmi,
|
2017-05-01 15:38:02 +02:00
|
|
|
int clock, bool respect_downstream_limits,
|
2020-01-08 20:12:35 +02:00
|
|
|
bool has_hdmi_sink)
|
2015-06-30 19:23:59 +03:00
|
|
|
{
|
2016-10-13 11:03:04 +01:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(intel_hdmi_to_dev(hdmi));
|
2015-06-30 19:23:59 +03:00
|
|
|
|
|
|
|
if (clock < 25000)
|
|
|
|
return MODE_CLOCK_LOW;
|
2020-01-08 20:12:35 +02:00
|
|
|
if (clock > hdmi_port_clock_limit(hdmi, respect_downstream_limits,
|
|
|
|
has_hdmi_sink))
|
2015-06-30 19:23:59 +03:00
|
|
|
return MODE_CLOCK_HIGH;
|
|
|
|
|
2021-02-03 11:30:44 +02:00
|
|
|
/* GLK DPLL can't generate 446-480 MHz */
|
|
|
|
if (IS_GEMINILAKE(dev_priv) && clock > 446666 && clock < 480000)
|
|
|
|
return MODE_CLOCK_RANGE;
|
|
|
|
|
|
|
|
/* BXT/GLK DPLL can't generate 223-240 MHz */
|
2021-04-07 13:39:45 -07:00
|
|
|
if ((IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) &&
|
|
|
|
clock > 223333 && clock < 240000)
|
2015-07-06 14:44:11 +03:00
|
|
|
return MODE_CLOCK_RANGE;
|
|
|
|
|
|
|
|
/* CHV DPLL can't generate 216-240 MHz */
|
2016-10-13 11:03:04 +01:00
|
|
|
if (IS_CHERRYVIEW(dev_priv) && clock > 216000 && clock < 240000)
|
2015-06-30 19:23:59 +03:00
|
|
|
return MODE_CLOCK_RANGE;
|
|
|
|
|
2021-07-23 10:42:33 -07:00
|
|
|
/*
|
|
|
|
* SNPS PHYs' MPLLB table-based programming can only handle a fixed
|
|
|
|
* set of link rates.
|
|
|
|
*
|
|
|
|
* FIXME: We will hopefully get an algorithmic way of programming
|
|
|
|
* the MPLLB for HDMI in the future.
|
|
|
|
*/
|
|
|
|
if (IS_DG2(dev_priv))
|
|
|
|
return intel_snps_phy_check_hdmi_link_rate(clock);
|
|
|
|
|
2015-06-30 19:23:59 +03:00
|
|
|
return MODE_OK;
|
|
|
|
}
|
|
|
|
|
2021-02-04 04:08:46 +02:00
|
|
|
static int intel_hdmi_port_clock(int clock, int bpc)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Need to adjust the port link by:
|
|
|
|
* 1.5x for 12bpc
|
|
|
|
* 1.25x for 10bpc
|
|
|
|
*/
|
|
|
|
return clock * bpc / 8;
|
|
|
|
}
|
|
|
|
|
2021-05-11 19:05:27 +03:00
|
|
|
static bool intel_hdmi_bpc_possible(struct drm_connector *connector,
|
|
|
|
int bpc, bool has_hdmi_sink, bool ycbcr420_output)
|
|
|
|
{
|
2021-05-11 19:05:29 +03:00
|
|
|
struct drm_i915_private *i915 = to_i915(connector->dev);
|
2021-05-11 19:05:27 +03:00
|
|
|
const struct drm_display_info *info = &connector->display_info;
|
|
|
|
const struct drm_hdmi_info *hdmi = &info->hdmi;
|
|
|
|
|
|
|
|
switch (bpc) {
|
|
|
|
case 12:
|
2021-05-11 19:05:29 +03:00
|
|
|
if (HAS_GMCH(i915))
|
|
|
|
return false;
|
|
|
|
|
2021-05-11 19:05:28 +03:00
|
|
|
if (!has_hdmi_sink)
|
|
|
|
return false;
|
|
|
|
|
2021-05-11 19:05:27 +03:00
|
|
|
if (ycbcr420_output)
|
|
|
|
return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_36;
|
|
|
|
else
|
|
|
|
return info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36;
|
|
|
|
case 10:
|
2021-05-11 19:05:29 +03:00
|
|
|
if (DISPLAY_VER(i915) < 11)
|
|
|
|
return false;
|
|
|
|
|
2021-05-11 19:05:28 +03:00
|
|
|
if (!has_hdmi_sink)
|
|
|
|
return false;
|
|
|
|
|
2021-05-11 19:05:27 +03:00
|
|
|
if (ycbcr420_output)
|
|
|
|
return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_30;
|
|
|
|
else
|
|
|
|
return info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_30;
|
|
|
|
case 8:
|
|
|
|
return true;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(bpc);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-10 15:33:47 +02:00
|
|
|
static enum drm_mode_status
|
2021-05-11 19:05:30 +03:00
|
|
|
intel_hdmi_mode_clock_valid(struct drm_connector *connector, int clock,
|
|
|
|
bool has_hdmi_sink, bool ycbcr420_output)
|
2021-05-10 15:33:47 +02:00
|
|
|
{
|
2021-05-11 19:05:30 +03:00
|
|
|
struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2021-05-10 15:33:47 +02:00
|
|
|
enum drm_mode_status status;
|
|
|
|
|
2021-05-11 19:05:31 +03:00
|
|
|
if (ycbcr420_output)
|
|
|
|
clock /= 2;
|
|
|
|
|
2021-05-10 15:33:47 +02:00
|
|
|
/* check if we can do 8bpc */
|
|
|
|
status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 8),
|
|
|
|
true, has_hdmi_sink);
|
|
|
|
|
2021-05-11 19:05:32 +03:00
|
|
|
/* if we can't do 8bpc we may still be able to do 12bpc */
|
|
|
|
if (status != MODE_OK &&
|
|
|
|
intel_hdmi_bpc_possible(connector, 12, has_hdmi_sink, ycbcr420_output))
|
|
|
|
status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 12),
|
|
|
|
true, has_hdmi_sink);
|
|
|
|
|
|
|
|
/* if we can't do 8,12bpc we may still be able to do 10bpc */
|
|
|
|
if (status != MODE_OK &&
|
|
|
|
intel_hdmi_bpc_possible(connector, 10, has_hdmi_sink, ycbcr420_output))
|
|
|
|
status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 10),
|
|
|
|
true, has_hdmi_sink);
|
2021-05-10 15:33:47 +02:00
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2013-11-28 15:29:18 +00:00
|
|
|
static enum drm_mode_status
|
|
|
|
intel_hdmi_mode_valid(struct drm_connector *connector,
|
|
|
|
struct drm_display_mode *mode)
|
2009-01-02 13:33:00 -08:00
|
|
|
{
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2015-06-30 19:23:59 +03:00
|
|
|
struct drm_device *dev = intel_hdmi_to_dev(hdmi);
|
2016-10-13 11:02:54 +01:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-06-30 19:23:59 +03:00
|
|
|
enum drm_mode_status status;
|
2020-01-08 20:12:35 +02:00
|
|
|
int clock = mode->clock;
|
2016-02-02 15:16:39 +02:00
|
|
|
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
|
2020-01-08 20:12:35 +02:00
|
|
|
bool has_hdmi_sink = intel_has_hdmi_sink(hdmi, connector->state);
|
2021-05-10 15:33:49 +02:00
|
|
|
bool ycbcr_420_only;
|
2015-06-30 19:23:59 +03:00
|
|
|
|
2018-05-24 15:54:03 +03:00
|
|
|
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
|
|
|
|
return MODE_NO_DBLESCAN;
|
|
|
|
|
2016-02-02 15:16:39 +02:00
|
|
|
if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING)
|
|
|
|
clock *= 2;
|
|
|
|
|
|
|
|
if (clock > max_dotclk)
|
|
|
|
return MODE_CLOCK_HIGH;
|
|
|
|
|
2020-01-08 20:12:39 +02:00
|
|
|
if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
|
|
|
|
if (!has_hdmi_sink)
|
|
|
|
return MODE_CLOCK_LOW;
|
2014-09-02 17:03:36 -07:00
|
|
|
clock *= 2;
|
2020-01-08 20:12:39 +02:00
|
|
|
}
|
2014-09-02 17:03:36 -07:00
|
|
|
|
2021-05-10 15:33:49 +02:00
|
|
|
ycbcr_420_only = drm_mode_is_420_only(&connector->display_info, mode);
|
2017-07-24 19:19:32 +05:30
|
|
|
|
2021-05-11 19:05:30 +03:00
|
|
|
status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, ycbcr_420_only);
|
2021-05-10 15:33:49 +02:00
|
|
|
if (status != MODE_OK) {
|
|
|
|
if (ycbcr_420_only ||
|
|
|
|
!connector->ycbcr_420_allowed ||
|
|
|
|
!drm_mode_is_420_also(&connector->display_info, mode))
|
|
|
|
return status;
|
2009-01-02 13:33:00 -08:00
|
|
|
|
2021-05-11 19:05:30 +03:00
|
|
|
status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, true);
|
2021-05-10 15:33:49 +02:00
|
|
|
if (status != MODE_OK)
|
|
|
|
return status;
|
2018-05-21 17:25:51 -07:00
|
|
|
}
|
2009-01-02 13:33:00 -08:00
|
|
|
|
2020-11-17 11:47:05 -08:00
|
|
|
return intel_mode_valid_max_plane_size(dev_priv, mode, false);
|
2009-01-02 13:33:00 -08:00
|
|
|
}
|
|
|
|
|
2020-09-04 14:53:52 +03:00
|
|
|
bool intel_hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
|
2020-09-04 14:53:54 +03:00
|
|
|
int bpc, bool has_hdmi_sink, bool ycbcr420_output)
|
2014-03-03 16:15:29 +02:00
|
|
|
{
|
2019-10-31 12:26:03 +01:00
|
|
|
struct drm_atomic_state *state = crtc_state->uapi.state;
|
2017-02-13 19:58:18 +02:00
|
|
|
struct drm_connector_state *connector_state;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
int i;
|
2014-03-03 16:15:29 +02:00
|
|
|
|
2019-05-07 11:18:56 -07:00
|
|
|
if (crtc_state->pipe_bpp < bpc * 3)
|
2017-10-26 18:14:04 +03:00
|
|
|
return false;
|
|
|
|
|
2017-07-12 10:13:34 +02:00
|
|
|
for_each_new_connector_in_state(state, connector, connector_state, i) {
|
2019-10-31 12:26:03 +01:00
|
|
|
if (connector_state->crtc != crtc_state->uapi.crtc)
|
2017-02-13 19:58:18 +02:00
|
|
|
continue;
|
|
|
|
|
2021-05-11 19:05:27 +03:00
|
|
|
if (!intel_hdmi_bpc_possible(connector, bpc, has_hdmi_sink, ycbcr420_output))
|
|
|
|
return false;
|
2017-02-13 19:58:18 +02:00
|
|
|
}
|
|
|
|
|
2020-09-04 14:53:52 +03:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
|
|
|
|
int bpc)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
to_i915(crtc_state->uapi.crtc->dev);
|
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
|
&crtc_state->hw.adjusted_mode;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* HDMI deep color affects the clocks, so it's only possible
|
|
|
|
* when not cloning with other encoder types.
|
|
|
|
*/
|
|
|
|
if (crtc_state->output_types != BIT(INTEL_OUTPUT_HDMI))
|
|
|
|
return false;
|
|
|
|
|
2020-01-28 17:51:50 +02:00
|
|
|
/* Display Wa_1405510057:icl,ehl */
|
2018-10-30 01:45:02 -07:00
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
|
drm/i915/display: rename display version macros
While converting the rest of the driver to use GRAPHICS_VER() and
MEDIA_VER(), following what was done for display, some discussions went
back on what we did for display:
1) Why is the == comparison special that deserves a separate
macro instead of just getting the version and comparing directly
like is done for >, >=, <=?
2) IS_DISPLAY_RANGE() is weird in that it omits the "_VER" for
brevity. If we remove the current users of IS_DISPLAY_VER(), we
could actually repurpose it for a range check
With (1) there could be an advantage if we used gen_mask since multiple
conditionals be combined by the compiler in a single and instruction and
check the result. However a) INTEL_GEN() doesn't use the mask since it
would make the code bigger everywhere else and b) in the cases it made
sense, it also made sense to convert to the _RANGE() variant.
So here we repurpose IS_DISPLAY_VER() to work with a [ from, to ] range
like was the IS_DISPLAY_RANGE() and convert the current IS_DISPLAY_VER()
users to use == and != operators. Aside from the definition changes,
this was done by the following semantic patch:
@@ expression dev_priv, E1; @@
- !IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) != E1
@@ expression dev_priv, E1; @@
- IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) == E1
@@ expression dev_priv, from, until; @@
- IS_DISPLAY_RANGE(dev_priv, from, until)
+ IS_DISPLAY_VER(dev_priv, from, until)
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
[Jani: Minor conflict resolve while applying.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-4-lucas.demarchi@intel.com
2021-04-12 22:09:53 -07:00
|
|
|
bpc == 10 && DISPLAY_VER(dev_priv) == 11 &&
|
2018-10-30 01:45:02 -07:00
|
|
|
(adjusted_mode->crtc_hblank_end -
|
|
|
|
adjusted_mode->crtc_hblank_start) % 8 == 2)
|
2017-04-24 13:47:18 +03:00
|
|
|
return false;
|
|
|
|
|
2020-09-04 14:53:52 +03:00
|
|
|
return intel_hdmi_deep_color_possible(crtc_state, bpc,
|
2020-09-04 14:53:54 +03:00
|
|
|
crtc_state->has_hdmi_sink,
|
|
|
|
crtc_state->output_format ==
|
|
|
|
INTEL_OUTPUT_FORMAT_YCBCR420);
|
2014-03-03 16:15:29 +02:00
|
|
|
}
|
|
|
|
|
2019-08-28 21:34:24 +03:00
|
|
|
static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
2020-01-08 20:12:35 +02:00
|
|
|
int clock)
|
2019-08-28 21:34:24 +03:00
|
|
|
{
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
2019-08-28 21:34:24 +03:00
|
|
|
int bpc;
|
|
|
|
|
|
|
|
for (bpc = 12; bpc >= 10; bpc -= 2) {
|
|
|
|
if (hdmi_deep_color_possible(crtc_state, bpc) &&
|
|
|
|
hdmi_port_clock_valid(intel_hdmi,
|
|
|
|
intel_hdmi_port_clock(clock, bpc),
|
2020-01-08 20:12:35 +02:00
|
|
|
true, crtc_state->has_hdmi_sink) == MODE_OK)
|
2019-08-28 21:34:24 +03:00
|
|
|
return bpc;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int intel_hdmi_compute_clock(struct intel_encoder *encoder,
|
2020-01-08 20:12:35 +02:00
|
|
|
struct intel_crtc_state *crtc_state)
|
2019-08-28 21:34:24 +03:00
|
|
|
{
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
2019-08-28 21:34:24 +03:00
|
|
|
const struct drm_display_mode *adjusted_mode =
|
2019-10-31 12:26:02 +01:00
|
|
|
&crtc_state->hw.adjusted_mode;
|
2019-08-28 21:34:24 +03:00
|
|
|
int bpc, clock = adjusted_mode->crtc_clock;
|
|
|
|
|
|
|
|
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
|
|
|
|
clock *= 2;
|
|
|
|
|
|
|
|
/* YCBCR420 TMDS rate requirement is half the pixel clock */
|
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)
|
|
|
|
clock /= 2;
|
|
|
|
|
2020-01-08 20:12:35 +02:00
|
|
|
bpc = intel_hdmi_compute_bpc(encoder, crtc_state, clock);
|
2019-08-28 21:34:24 +03:00
|
|
|
|
|
|
|
crtc_state->port_clock = intel_hdmi_port_clock(clock, bpc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* pipe_bpp could already be below 8bpc due to
|
|
|
|
* FDI bandwidth constraints. We shouldn't bump it
|
|
|
|
* back up to 8bpc in that case.
|
|
|
|
*/
|
|
|
|
if (crtc_state->pipe_bpp > bpc * 3)
|
|
|
|
crtc_state->pipe_bpp = bpc * 3;
|
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"picking %d bpc for HDMI output (pipe bpp: %d)\n",
|
|
|
|
bpc, crtc_state->pipe_bpp);
|
2019-08-28 21:34:24 +03:00
|
|
|
|
|
|
|
if (hdmi_port_clock_valid(intel_hdmi, crtc_state->port_clock,
|
2020-01-08 20:12:35 +02:00
|
|
|
false, crtc_state->has_hdmi_sink) != MODE_OK) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"unsupported HDMI clock (%d kHz), rejecting mode\n",
|
|
|
|
crtc_state->port_clock);
|
2019-08-28 21:34:24 +03:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-01-08 20:12:38 +02:00
|
|
|
bool intel_hdmi_limited_color_range(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2019-07-18 17:50:45 +03:00
|
|
|
{
|
|
|
|
const struct intel_digital_connector_state *intel_conn_state =
|
|
|
|
to_intel_digital_connector_state(conn_state);
|
|
|
|
const struct drm_display_mode *adjusted_mode =
|
2019-10-31 12:26:02 +01:00
|
|
|
&crtc_state->hw.adjusted_mode;
|
2019-07-18 17:50:45 +03:00
|
|
|
|
2019-07-18 19:45:23 +03:00
|
|
|
/*
|
|
|
|
* Our YCbCr output is always limited range.
|
|
|
|
* crtc_state->limited_color_range only applies to RGB,
|
|
|
|
* and it must never be set for YCbCr or we risk setting
|
|
|
|
* some conflicting bits in PIPECONF which will mess up
|
|
|
|
* the colors on the monitor.
|
|
|
|
*/
|
|
|
|
if (crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB)
|
|
|
|
return false;
|
|
|
|
|
2019-07-18 17:50:45 +03:00
|
|
|
if (intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_AUTO) {
|
|
|
|
/* See CEA-861-E - 5.1 Default Encoding Parameters */
|
|
|
|
return crtc_state->has_hdmi_sink &&
|
|
|
|
drm_default_rgb_quant_range(adjusted_mode) ==
|
|
|
|
HDMI_QUANTIZATION_RANGE_LIMITED;
|
|
|
|
} else {
|
|
|
|
return intel_conn_state->broadcast_rgb == INTEL_BROADCAST_RGB_LIMITED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-04 14:53:51 +03:00
|
|
|
static bool intel_hdmi_has_audio(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
|
|
|
const struct intel_digital_connector_state *intel_conn_state =
|
|
|
|
to_intel_digital_connector_state(conn_state);
|
|
|
|
|
|
|
|
if (!crtc_state->has_hdmi_sink)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
|
|
|
|
return intel_hdmi->has_audio;
|
|
|
|
else
|
|
|
|
return intel_conn_state->force_audio == HDMI_AUDIO_ON;
|
|
|
|
}
|
|
|
|
|
2021-05-10 15:33:48 +02:00
|
|
|
static int intel_hdmi_compute_output_format(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector = conn_state->connector;
|
|
|
|
struct drm_i915_private *i915 = to_i915(connector->dev);
|
|
|
|
const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
|
|
|
|
int ret;
|
|
|
|
bool ycbcr_420_only;
|
|
|
|
|
|
|
|
ycbcr_420_only = drm_mode_is_420_only(&connector->display_info, adjusted_mode);
|
|
|
|
if (connector->ycbcr_420_allowed && ycbcr_420_only) {
|
|
|
|
crtc_state->output_format = INTEL_OUTPUT_FORMAT_YCBCR420;
|
|
|
|
} else {
|
|
|
|
if (!connector->ycbcr_420_allowed && ycbcr_420_only)
|
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"YCbCr 4:2:0 mode but YCbCr 4:2:0 output not possible. Falling back to RGB.\n");
|
|
|
|
crtc_state->output_format = INTEL_OUTPUT_FORMAT_RGB;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = intel_hdmi_compute_clock(encoder, crtc_state);
|
2021-05-10 15:33:49 +02:00
|
|
|
if (ret) {
|
|
|
|
if (crtc_state->output_format != INTEL_OUTPUT_FORMAT_YCBCR420 &&
|
|
|
|
connector->ycbcr_420_allowed &&
|
|
|
|
drm_mode_is_420_also(&connector->display_info, adjusted_mode)) {
|
|
|
|
crtc_state->output_format = INTEL_OUTPUT_FORMAT_YCBCR420;
|
|
|
|
ret = intel_hdmi_compute_clock(encoder, crtc_state);
|
|
|
|
}
|
|
|
|
}
|
2021-05-10 15:33:48 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2019-01-15 15:08:00 -05:00
|
|
|
int intel_hdmi_compute_config(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *pipe_config,
|
|
|
|
struct drm_connector_state *conn_state)
|
2009-01-02 13:33:00 -08:00
|
|
|
{
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
2016-10-13 11:02:52 +01:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 12:26:02 +01:00
|
|
|
struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
|
2017-07-21 20:55:04 +05:30
|
|
|
struct drm_connector *connector = conn_state->connector;
|
|
|
|
struct drm_scdc *scdc = &connector->display_info.hdmi.scdc;
|
2019-08-28 21:34:24 +03:00
|
|
|
int ret;
|
2013-01-17 16:31:28 +02:00
|
|
|
|
2018-05-24 15:54:03 +03:00
|
|
|
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
|
2019-01-15 15:08:00 -05:00
|
|
|
return -EINVAL;
|
2018-05-24 15:54:03 +03:00
|
|
|
|
2018-10-12 11:53:07 +05:30
|
|
|
pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
|
2020-01-08 20:12:35 +02:00
|
|
|
pipe_config->has_hdmi_sink = intel_has_hdmi_sink(intel_hdmi,
|
|
|
|
conn_state);
|
2014-04-24 23:54:47 +02:00
|
|
|
|
2014-11-05 14:26:08 -08:00
|
|
|
if (pipe_config->has_hdmi_sink)
|
|
|
|
pipe_config->has_infoframe = true;
|
|
|
|
|
2019-08-28 21:34:24 +03:00
|
|
|
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
|
2014-09-02 17:03:36 -07:00
|
|
|
pipe_config->pixel_multiplier = 2;
|
|
|
|
|
2016-10-13 11:02:52 +01:00
|
|
|
if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv))
|
2013-03-27 00:44:55 +01:00
|
|
|
pipe_config->has_pch_encoder = true;
|
|
|
|
|
2020-09-04 14:53:51 +03:00
|
|
|
pipe_config->has_audio =
|
|
|
|
intel_hdmi_has_audio(encoder, pipe_config, conn_state);
|
2014-04-24 23:54:52 +02:00
|
|
|
|
2021-05-10 15:33:48 +02:00
|
|
|
ret = intel_hdmi_compute_output_format(encoder, pipe_config, conn_state);
|
2019-08-28 21:34:24 +03:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2013-04-19 11:24:33 +02:00
|
|
|
|
2021-05-10 15:33:48 +02:00
|
|
|
if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {
|
2021-08-25 14:06:52 +03:00
|
|
|
ret = intel_panel_fitting(pipe_config, conn_state);
|
2021-05-10 15:33:48 +02:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
pipe_config->limited_color_range =
|
|
|
|
intel_hdmi_limited_color_range(pipe_config, conn_state);
|
|
|
|
|
2019-06-20 17:26:38 +03:00
|
|
|
if (conn_state->picture_aspect_ratio)
|
|
|
|
adjusted_mode->picture_aspect_ratio =
|
|
|
|
conn_state->picture_aspect_ratio;
|
2015-09-08 13:40:48 +03:00
|
|
|
|
2016-04-27 15:44:16 +03:00
|
|
|
pipe_config->lane_count = 4;
|
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (scdc->scrambling.supported && DISPLAY_VER(dev_priv) >= 10) {
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
if (scdc->scrambling.low_rates)
|
|
|
|
pipe_config->hdmi_scrambling = true;
|
|
|
|
|
|
|
|
if (pipe_config->port_clock > 340000) {
|
|
|
|
pipe_config->hdmi_scrambling = true;
|
|
|
|
pipe_config->hdmi_high_tmds_clock_ratio = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-13 18:48:30 +02:00
|
|
|
intel_hdmi_compute_gcp_infoframe(encoder, pipe_config,
|
|
|
|
conn_state);
|
2019-02-25 19:41:01 +02:00
|
|
|
|
|
|
|
if (!intel_hdmi_compute_avi_infoframe(encoder, pipe_config, conn_state)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "bad AVI infoframe\n");
|
2019-02-25 19:41:01 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!intel_hdmi_compute_spd_infoframe(encoder, pipe_config, conn_state)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "bad SPD infoframe\n");
|
2019-02-25 19:41:01 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!intel_hdmi_compute_hdmi_infoframe(encoder, pipe_config, conn_state)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "bad HDMI infoframe\n");
|
2019-02-25 19:41:01 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2019-05-18 16:09:27 +05:30
|
|
|
if (!intel_hdmi_compute_drm_infoframe(encoder, pipe_config, conn_state)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "bad DRM infoframe\n");
|
2019-05-18 16:09:27 +05:30
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2019-01-15 15:08:00 -05:00
|
|
|
return 0;
|
2009-01-02 13:33:00 -08:00
|
|
|
}
|
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
static void
|
|
|
|
intel_hdmi_unset_edid(struct drm_connector *connector)
|
2009-04-02 13:13:26 +08:00
|
|
|
{
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2009-04-02 13:13:26 +08:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
intel_hdmi->has_hdmi_sink = false;
|
|
|
|
intel_hdmi->has_audio = false;
|
|
|
|
|
2016-05-02 22:08:23 +03:00
|
|
|
intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE;
|
|
|
|
intel_hdmi->dp_dual_mode.max_tmds_clock = 0;
|
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
kfree(to_intel_connector(connector)->detect_edid);
|
|
|
|
to_intel_connector(connector)->detect_edid = NULL;
|
|
|
|
}
|
|
|
|
|
2016-05-02 22:08:23 +03:00
|
|
|
static void
|
2016-05-04 14:45:22 +03:00
|
|
|
intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid)
|
2016-05-02 22:08:23 +03:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2017-11-09 17:24:34 +02:00
|
|
|
enum port port = hdmi_to_dig_port(hdmi)->base.port;
|
2016-05-02 22:08:23 +03:00
|
|
|
struct i2c_adapter *adapter =
|
|
|
|
intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
|
2021-04-23 14:43:00 -04:00
|
|
|
enum drm_dp_dual_mode_type type = drm_dp_dual_mode_detect(&dev_priv->drm, adapter);
|
2016-05-02 22:08:23 +03:00
|
|
|
|
2016-05-04 14:45:22 +03:00
|
|
|
/*
|
|
|
|
* Type 1 DVI adaptors are not required to implement any
|
|
|
|
* registers, so we can't always detect their presence.
|
|
|
|
* Ideally we should be able to check the state of the
|
|
|
|
* CONFIG1 pin, but no such luck on our hardware.
|
|
|
|
*
|
|
|
|
* The only method left to us is to check the VBT to see
|
|
|
|
* if the port is a dual mode capable DP port. But let's
|
|
|
|
* only do that when we sucesfully read the EDID, to avoid
|
|
|
|
* confusing log messages about DP dual mode adaptors when
|
|
|
|
* there's nothing connected to the port.
|
|
|
|
*/
|
|
|
|
if (type == DRM_DP_DUAL_MODE_UNKNOWN) {
|
2017-12-15 12:20:55 +02:00
|
|
|
/* An overridden EDID imply that we want this port for testing.
|
|
|
|
* Make sure not to set limits for that port.
|
|
|
|
*/
|
|
|
|
if (has_edid && !connector->override_edid &&
|
2016-05-04 14:45:22 +03:00
|
|
|
intel_bios_is_port_dp_dual_mode(dev_priv, port)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Assuming DP dual mode adaptor presence based on VBT\n");
|
2016-05-04 14:45:22 +03:00
|
|
|
type = DRM_DP_DUAL_MODE_TYPE1_DVI;
|
|
|
|
} else {
|
|
|
|
type = DRM_DP_DUAL_MODE_NONE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type == DRM_DP_DUAL_MODE_NONE)
|
2016-05-02 22:08:23 +03:00
|
|
|
return;
|
|
|
|
|
|
|
|
hdmi->dp_dual_mode.type = type;
|
|
|
|
hdmi->dp_dual_mode.max_tmds_clock =
|
2021-04-23 14:43:02 -04:00
|
|
|
drm_dp_dual_mode_max_tmds_clock(&dev_priv->drm, type, adapter);
|
2016-05-02 22:08:23 +03:00
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"DP dual mode adaptor (%s) detected (max TMDS clock: %d kHz)\n",
|
|
|
|
drm_dp_get_dual_mode_type_name(type),
|
|
|
|
hdmi->dp_dual_mode.max_tmds_clock);
|
2016-05-02 22:08:23 +03:00
|
|
|
}
|
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
static bool
|
2016-08-17 15:47:48 +03:00
|
|
|
intel_hdmi_set_edid(struct drm_connector *connector)
|
2014-09-02 20:04:01 +01:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_wakeref_t wakeref;
|
2016-08-17 15:47:48 +03:00
|
|
|
struct edid *edid;
|
2014-09-02 20:04:01 +01:00
|
|
|
bool connected = false;
|
2017-12-31 23:34:54 +01:00
|
|
|
struct i2c_adapter *i2c;
|
2013-07-20 20:27:08 +01:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2017-12-31 23:34:54 +01:00
|
|
|
i2c = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
|
|
|
|
|
|
|
|
edid = drm_get_edid(connector, i2c);
|
|
|
|
|
|
|
|
if (!edid && !intel_gmbus_is_forced_bit(i2c)) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"HDMI GMBUS EDID read failed, retry using GPIO bit-banging\n");
|
2017-12-31 23:34:54 +01:00
|
|
|
intel_gmbus_force_bit(i2c, true);
|
|
|
|
edid = drm_get_edid(connector, i2c);
|
|
|
|
intel_gmbus_force_bit(i2c, false);
|
|
|
|
}
|
drm/i915: hdmi detection according by reading edid
According to investigations from windows team ,hw team,
and our test results on all 4x platofrms available
(gm45, g45b, q45, g45a, g45c, g41a, and g41), we find
currently Hot plug live status and Hot plug interrupt
detection are not reliable, sometime the results from
the two approaches are contradicts. So we chose edid
detection for hdmi output.
Signed-off-by: Ma Ling <ling.ma@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
2009-07-16 17:23:09 +08:00
|
|
|
|
2016-08-17 15:47:48 +03:00
|
|
|
intel_hdmi_dp_dual_mode_detect(connector, edid != NULL);
|
2016-05-02 22:08:23 +03:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS, wakeref);
|
2009-06-05 15:38:43 +08:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
to_intel_connector(connector)->detect_edid = edid;
|
|
|
|
if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
|
|
|
|
intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
|
2017-05-01 15:38:02 +02:00
|
|
|
intel_hdmi->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
|
2014-09-02 20:04:01 +01:00
|
|
|
|
|
|
|
connected = true;
|
2010-09-19 09:29:33 +01:00
|
|
|
}
|
|
|
|
|
2018-07-04 17:08:17 +02:00
|
|
|
cec_notifier_set_phys_addr_from_edid(intel_hdmi->cec_notifier, edid);
|
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
return connected;
|
|
|
|
}
|
|
|
|
|
2015-10-08 21:50:57 +02:00
|
|
|
static enum drm_connector_status
|
|
|
|
intel_hdmi_detect(struct drm_connector *connector, bool force)
|
2014-09-02 20:04:01 +01:00
|
|
|
{
|
2018-08-01 10:34:41 -07:00
|
|
|
enum drm_connector_status status = connector_status_disconnected;
|
2015-10-08 21:50:57 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2018-08-01 10:34:41 -07:00
|
|
|
struct intel_encoder *encoder = &hdmi_to_dig_port(intel_hdmi)->base;
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_wakeref_t wakeref;
|
2014-09-02 20:04:01 +01:00
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
|
|
|
|
connector->base.id, connector->name);
|
2015-10-08 21:50:57 +02:00
|
|
|
|
2020-09-10 19:42:56 +03:00
|
|
|
if (!INTEL_DISPLAY_ENABLED(dev_priv))
|
|
|
|
return connector_status_disconnected;
|
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
|
2015-11-19 20:55:01 +02:00
|
|
|
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 11 &&
|
2018-08-01 10:34:41 -07:00
|
|
|
!intel_digital_port_connected(encoder))
|
|
|
|
goto out;
|
|
|
|
|
2015-10-08 21:50:57 +02:00
|
|
|
intel_hdmi_unset_edid(connector);
|
drm/i915: Add hot_plug hook for hdmi encoder
This patch adds a separate probe function for HDMI
EDID read over DDC channel. This function has been
registered as a .hot_plug handler for HDMI encoder.
The current implementation of hdmi_detect()
function re-sets the cached HDMI edid (in connector->detect_edid) in
every detect call.This function gets called many times, sometimes
directly from userspace probes, forcing drivers to read EDID every
detect function call.This causes several problems like:
1. Race conditions in multiple hot_plug / unplug cases, between
interrupts bottom halves and userspace detections.
2. Many Un-necessary EDID reads for single hotplug/unplug
3. HDMI complaince failures which expects only one EDID read per hotplug
This function will be serving the purpose of really reading the EDID
by really probing the DDC channel, and updating the cached EDID.
The plan is to:
1. i915 IRQ handler bottom half function already calls
intel_encoder->hotplug() function. Adding This probe function which
will read the EDID only in case of a hotplug / unplug.
2. During init_connector this probe will be called to read the edid
3. Reuse the cached EDID in hdmi_detect() function.
The "< gen7" check is there because this was tested only for >=gen7
platforms. For older platforms the hotplug/reading edid path remains same.
v2: Calling set_edid instead of hdmi_probe during init.
Also, for platforms having DDI, intel_encoder for DP and HDMI is same
(taken from intel_dig_port), so for DP also, hot_plug function gets called
which is not intended here. So, check for HDMI in intel_hdmi_probe
Rely on HPD for updating edid only for platforms gen > 8 and also for VLV.
v3: Dropping the gen < 8 || !VLV check. Now all platforms should rely on
hotplug or init for updating the edid.(Daniel)
Also, calling hdmi_probe in init instead of set_edid
v4: Renaming intel_hdmi_probe to intel_hdmi_hot_plug.
Also calling this hotplug handler from intel_hpd_init to take care of init
resume scenarios.
v5: Moved the call to encoder hotplug during init to separate patch(Daniel)
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
[danvet: Mark intel_hdmi_hot_plug as static.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-10-05 16:43:15 +05:30
|
|
|
|
2017-10-27 22:31:24 +03:00
|
|
|
if (intel_hdmi_set_edid(connector))
|
2014-09-02 20:04:01 +01:00
|
|
|
status = connector_status_connected;
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2018-08-01 10:34:41 -07:00
|
|
|
out:
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS, wakeref);
|
2015-11-19 20:55:01 +02:00
|
|
|
|
2018-07-04 17:08:17 +02:00
|
|
|
if (status != connector_status_connected)
|
|
|
|
cec_notifier_phys_addr_invalidate(intel_hdmi->cec_notifier);
|
|
|
|
|
2019-10-28 20:15:17 +02:00
|
|
|
/*
|
|
|
|
* Make sure the refs for power wells enabled during detect are
|
|
|
|
* dropped to avoid a new detect cycle triggered by HPD polling.
|
|
|
|
*/
|
|
|
|
intel_display_power_flush_work(dev_priv);
|
|
|
|
|
drm/i915: hdmi detection according by reading edid
According to investigations from windows team ,hw team,
and our test results on all 4x platofrms available
(gm45, g45b, q45, g45a, g45c, g41a, and g41), we find
currently Hot plug live status and Hot plug interrupt
detection are not reliable, sometime the results from
the two approaches are contradicts. So we chose edid
detection for hdmi output.
Signed-off-by: Ma Ling <ling.ma@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
2009-07-16 17:23:09 +08:00
|
|
|
return status;
|
2009-01-02 13:33:00 -08:00
|
|
|
}
|
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
static void
|
|
|
|
intel_hdmi_force(struct drm_connector *connector)
|
2009-01-02 13:33:00 -08:00
|
|
|
{
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
struct drm_i915_private *i915 = to_i915(connector->dev);
|
|
|
|
|
|
|
|
drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n",
|
|
|
|
connector->base.id, connector->name);
|
2009-01-02 13:33:00 -08:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
intel_hdmi_unset_edid(connector);
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
if (connector->status != connector_status_connected)
|
|
|
|
return;
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2016-08-17 15:47:48 +03:00
|
|
|
intel_hdmi_set_edid(connector);
|
2014-09-02 20:04:01 +01:00
|
|
|
}
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
static int intel_hdmi_get_modes(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct edid *edid;
|
|
|
|
|
|
|
|
edid = to_intel_connector(connector)->detect_edid;
|
|
|
|
if (edid == NULL)
|
|
|
|
return 0;
|
2014-03-05 16:20:53 +02:00
|
|
|
|
2014-09-02 20:04:01 +01:00
|
|
|
return intel_connector_update_modes(connector, edid);
|
2009-01-02 13:33:00 -08:00
|
|
|
}
|
|
|
|
|
2019-05-20 18:06:42 +03:00
|
|
|
static struct i2c_adapter *
|
|
|
|
intel_hdmi_get_i2c_adapter(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2019-12-04 20:05:42 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = intel_attached_hdmi(to_intel_connector(connector));
|
2019-05-20 18:06:42 +03:00
|
|
|
|
|
|
|
return intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector)
|
|
|
|
{
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
struct drm_i915_private *i915 = to_i915(connector->dev);
|
2019-05-20 18:06:42 +03:00
|
|
|
struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
|
|
|
|
struct kobject *i2c_kobj = &adapter->dev.kobj;
|
|
|
|
struct kobject *connector_kobj = &connector->kdev->kobj;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = sysfs_create_link(connector_kobj, i2c_kobj, i2c_kobj->name);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_err(&i915->drm, "Failed to create i2c symlink (%d)\n", ret);
|
2019-05-20 18:06:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void intel_hdmi_remove_i2c_symlink(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
|
|
|
|
struct kobject *i2c_kobj = &adapter->dev.kobj;
|
|
|
|
struct kobject *connector_kobj = &connector->kdev->kobj;
|
|
|
|
|
|
|
|
sysfs_remove_link(connector_kobj, i2c_kobj->name);
|
|
|
|
}
|
|
|
|
|
2018-10-23 14:52:29 +05:30
|
|
|
static int
|
|
|
|
intel_hdmi_connector_register(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = intel_connector_register(connector);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2019-05-20 18:06:42 +03:00
|
|
|
intel_hdmi_create_i2c_symlink(connector);
|
|
|
|
|
2018-10-23 14:52:29 +05:30
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-02-12 14:54:45 +01:00
|
|
|
static void intel_hdmi_connector_unregister(struct drm_connector *connector)
|
2009-01-02 13:33:00 -08:00
|
|
|
{
|
2019-12-04 20:05:42 +02:00
|
|
|
struct cec_notifier *n = intel_attached_hdmi(to_intel_connector(connector))->cec_notifier;
|
2019-08-14 12:45:00 +02:00
|
|
|
|
|
|
|
cec_notifier_conn_unregister(n);
|
2018-10-09 17:11:03 +03:00
|
|
|
|
2019-05-20 18:06:42 +03:00
|
|
|
intel_hdmi_remove_i2c_symlink(connector);
|
|
|
|
intel_connector_unregister(connector);
|
|
|
|
}
|
|
|
|
|
2009-01-02 13:33:00 -08:00
|
|
|
static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
|
|
|
|
.detect = intel_hdmi_detect,
|
2014-09-02 20:04:01 +01:00
|
|
|
.force = intel_hdmi_force,
|
2009-01-02 13:33:00 -08:00
|
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
2017-05-01 15:38:02 +02:00
|
|
|
.atomic_get_property = intel_digital_connector_atomic_get_property,
|
|
|
|
.atomic_set_property = intel_digital_connector_atomic_set_property,
|
2018-10-23 14:52:29 +05:30
|
|
|
.late_register = intel_hdmi_connector_register,
|
2019-05-20 18:06:42 +03:00
|
|
|
.early_unregister = intel_hdmi_connector_unregister,
|
2020-02-12 14:54:45 +01:00
|
|
|
.destroy = intel_connector_destroy,
|
2015-01-22 16:50:32 -08:00
|
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
2017-05-01 15:38:02 +02:00
|
|
|
.atomic_duplicate_state = intel_digital_connector_duplicate_state,
|
2009-01-02 13:33:00 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
|
|
|
|
.get_modes = intel_hdmi_get_modes,
|
|
|
|
.mode_valid = intel_hdmi_mode_valid,
|
2017-05-01 15:38:02 +02:00
|
|
|
.atomic_check = intel_digital_connector_atomic_check,
|
2009-01-02 13:33:00 -08:00
|
|
|
};
|
|
|
|
|
2010-09-19 09:29:33 +01:00
|
|
|
static void
|
|
|
|
intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector)
|
|
|
|
{
|
2018-10-22 18:44:00 -07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
|
|
|
|
2011-05-12 22:17:24 +01:00
|
|
|
intel_attach_force_audio_property(connector);
|
2011-02-21 22:23:52 +00:00
|
|
|
intel_attach_broadcast_rgb_property(connector);
|
2014-06-11 11:06:01 +05:30
|
|
|
intel_attach_aspect_ratio_property(connector);
|
2019-02-19 22:43:01 +05:30
|
|
|
|
2020-12-01 02:17:32 +05:30
|
|
|
intel_attach_hdmi_colorspace_property(connector);
|
2018-05-15 16:59:28 +03:00
|
|
|
drm_connector_attach_content_type_property(connector);
|
2018-10-22 18:44:00 -07:00
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 10)
|
2021-04-30 11:44:47 +02:00
|
|
|
drm_connector_attach_hdr_output_metadata_property(connector);
|
2019-05-17 21:49:09 +05:30
|
|
|
|
2019-02-04 14:25:38 -08:00
|
|
|
if (!HAS_GMCH(dev_priv))
|
2018-10-22 18:44:00 -07:00
|
|
|
drm_connector_attach_max_bpc_property(connector, 8, 12);
|
2010-09-19 09:29:33 +01:00
|
|
|
}
|
|
|
|
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
/*
|
|
|
|
* intel_hdmi_handle_sink_scrambling: handle sink scrambling/clock ratio setup
|
|
|
|
* @encoder: intel_encoder
|
|
|
|
* @connector: drm_connector
|
|
|
|
* @high_tmds_clock_ratio = bool to indicate if the function needs to set
|
|
|
|
* or reset the high tmds clock ratio for scrambling
|
|
|
|
* @scrambling: bool to Indicate if the function needs to set or reset
|
|
|
|
* sink scrambling
|
|
|
|
*
|
|
|
|
* This function handles scrambling on HDMI 2.0 capable sinks.
|
|
|
|
* If required clock rate is > 340 Mhz && scrambling is supported by sink
|
|
|
|
* it enables scrambling. This should be called before enabling the HDMI
|
|
|
|
* 2.0 port, as the sink can choose to disable the scrambling if it doesn't
|
|
|
|
* detect a scrambled clock within 100 ms.
|
2018-03-22 17:47:07 +02:00
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* True on success, false on failure.
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
*/
|
2018-03-22 17:47:07 +02:00
|
|
|
bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
struct drm_connector *connector,
|
|
|
|
bool high_tmds_clock_ratio,
|
|
|
|
bool scrambling)
|
|
|
|
{
|
2018-03-22 17:47:07 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 20:05:43 +02:00
|
|
|
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
struct drm_scrambling *sink_scrambling =
|
2018-03-22 17:47:07 +02:00
|
|
|
&connector->display_info.hdmi.scdc.scrambling;
|
|
|
|
struct i2c_adapter *adapter =
|
|
|
|
intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
|
|
|
|
if (!sink_scrambling->supported)
|
2018-03-22 17:47:07 +02:00
|
|
|
return true;
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[CONNECTOR:%d:%s] scrambling=%s, TMDS bit clock ratio=1/%d\n",
|
|
|
|
connector->base.id, connector->name,
|
|
|
|
yesno(scrambling), high_tmds_clock_ratio ? 40 : 10);
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
|
2018-03-22 17:47:07 +02:00
|
|
|
/* Set TMDS bit clock ratio to 1/40 or 1/10, and enable/disable scrambling */
|
|
|
|
return drm_scdc_set_high_tmds_clock_ratio(adapter,
|
|
|
|
high_tmds_clock_ratio) &&
|
|
|
|
drm_scdc_set_scrambling(adapter, scrambling);
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 16:54:03 +05:30
|
|
|
}
|
|
|
|
|
2017-08-16 16:45:14 -07:00
|
|
|
static u8 chv_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
2016-10-11 20:52:46 +03:00
|
|
|
{
|
|
|
|
u8 ddc_pin;
|
|
|
|
|
2017-08-16 16:45:14 -07:00
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
|
|
|
ddc_pin = GMBUS_PIN_DPB;
|
|
|
|
break;
|
|
|
|
case PORT_C:
|
|
|
|
ddc_pin = GMBUS_PIN_DPC;
|
|
|
|
break;
|
|
|
|
case PORT_D:
|
|
|
|
ddc_pin = GMBUS_PIN_DPD_CHV;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(port);
|
|
|
|
ddc_pin = GMBUS_PIN_DPB;
|
|
|
|
break;
|
2016-10-11 20:52:46 +03:00
|
|
|
}
|
2017-08-16 16:45:14 -07:00
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8 bxt_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
|
|
|
u8 ddc_pin;
|
2016-10-11 20:52:46 +03:00
|
|
|
|
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
2017-08-16 16:45:14 -07:00
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
2016-10-11 20:52:46 +03:00
|
|
|
break;
|
|
|
|
case PORT_C:
|
2017-08-16 16:45:14 -07:00
|
|
|
ddc_pin = GMBUS_PIN_2_BXT;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(port);
|
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8 cnp_port_to_ddc_pin(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
|
|
|
u8 ddc_pin;
|
|
|
|
|
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
|
|
|
break;
|
|
|
|
case PORT_C:
|
|
|
|
ddc_pin = GMBUS_PIN_2_BXT;
|
2016-10-11 20:52:46 +03:00
|
|
|
break;
|
|
|
|
case PORT_D:
|
2017-08-16 16:45:14 -07:00
|
|
|
ddc_pin = GMBUS_PIN_4_CNP;
|
|
|
|
break;
|
2018-01-29 15:22:19 -08:00
|
|
|
case PORT_F:
|
|
|
|
ddc_pin = GMBUS_PIN_3_BXT;
|
|
|
|
break;
|
2017-08-16 16:45:14 -07:00
|
|
|
default:
|
|
|
|
MISSING_CASE(port);
|
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
2018-01-11 16:00:09 -02:00
|
|
|
static u8 icl_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
2019-07-11 10:31:12 -07:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2018-01-11 16:00:09 -02:00
|
|
|
|
2019-07-11 10:31:12 -07:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
|
|
|
return GMBUS_PIN_1_BXT + port;
|
|
|
|
else if (intel_phy_is_tc(dev_priv, phy))
|
|
|
|
return GMBUS_PIN_9_TC1_ICP + intel_port_to_tc(dev_priv, port);
|
|
|
|
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
drm_WARN(&dev_priv->drm, 1, "Unknown port:%c\n", port_name(port));
|
2019-07-11 10:31:12 -07:00
|
|
|
return GMBUS_PIN_2_BXT;
|
2018-01-11 16:00:09 -02:00
|
|
|
}
|
|
|
|
|
2019-06-14 17:42:10 -07:00
|
|
|
static u8 mcc_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
2019-07-12 15:16:41 -07:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2019-06-14 17:42:10 -07:00
|
|
|
u8 ddc_pin;
|
|
|
|
|
2019-07-12 15:16:41 -07:00
|
|
|
switch (phy) {
|
|
|
|
case PHY_A:
|
2019-06-14 17:42:10 -07:00
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
|
|
|
break;
|
2019-07-12 15:16:41 -07:00
|
|
|
case PHY_B:
|
2019-06-14 17:42:10 -07:00
|
|
|
ddc_pin = GMBUS_PIN_2_BXT;
|
|
|
|
break;
|
2019-07-12 15:16:41 -07:00
|
|
|
case PHY_C:
|
2019-06-14 17:42:10 -07:00
|
|
|
ddc_pin = GMBUS_PIN_9_TC1_ICP;
|
|
|
|
break;
|
|
|
|
default:
|
2019-07-12 15:16:41 -07:00
|
|
|
MISSING_CASE(phy);
|
2019-06-14 17:42:10 -07:00
|
|
|
ddc_pin = GMBUS_PIN_1_BXT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
2020-06-03 14:15:22 -07:00
|
|
|
static u8 rkl_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
|
|
|
|
|
|
|
WARN_ON(port == PORT_C);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pin mapping for RKL depends on which PCH is present. With TGP, the
|
|
|
|
* final two outputs use type-c pins, even though they're actually
|
|
|
|
* combo outputs. With CMP, the traditional DDI A-D pins are used for
|
|
|
|
* all outputs.
|
|
|
|
*/
|
|
|
|
if (INTEL_PCH_TYPE(dev_priv) >= PCH_TGP && phy >= PHY_C)
|
|
|
|
return GMBUS_PIN_9_TC1_ICP + phy - PHY_C;
|
|
|
|
|
|
|
|
return GMBUS_PIN_1_BXT + phy;
|
|
|
|
}
|
|
|
|
|
2021-02-09 14:07:45 -05:00
|
|
|
static u8 gen9bc_tgp_port_to_ddc_pin(struct drm_i915_private *i915, enum port port)
|
|
|
|
{
|
|
|
|
enum phy phy = intel_port_to_phy(i915, port);
|
|
|
|
|
|
|
|
drm_WARN_ON(&i915->drm, port == PORT_A);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pin mapping for GEN9 BC depends on which PCH is present. With TGP,
|
|
|
|
* final two outputs use type-c pins, even though they're actually
|
|
|
|
* combo outputs. With CMP, the traditional DDI A-D pins are used for
|
|
|
|
* all outputs.
|
|
|
|
*/
|
|
|
|
if (INTEL_PCH_TYPE(i915) >= PCH_TGP && phy >= PHY_C)
|
|
|
|
return GMBUS_PIN_9_TC1_ICP + phy - PHY_C;
|
|
|
|
|
|
|
|
return GMBUS_PIN_1_BXT + phy;
|
|
|
|
}
|
|
|
|
|
2020-10-06 17:22:07 -07:00
|
|
|
static u8 dg1_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
|
|
|
return intel_port_to_phy(dev_priv, port) + 1;
|
|
|
|
}
|
|
|
|
|
2021-01-25 06:07:51 -08:00
|
|
|
static u8 adls_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
{
|
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
|
|
|
|
|
|
|
WARN_ON(port == PORT_B || port == PORT_C);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pin mapping for ADL-S requires TC pins for all combo phy outputs
|
|
|
|
* except first combo output.
|
|
|
|
*/
|
|
|
|
if (phy == PHY_A)
|
|
|
|
return GMBUS_PIN_1_BXT;
|
|
|
|
|
|
|
|
return GMBUS_PIN_9_TC1_ICP + phy - PHY_B;
|
|
|
|
}
|
|
|
|
|
2017-08-16 16:45:14 -07:00
|
|
|
static u8 g4x_port_to_ddc_pin(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
|
|
|
u8 ddc_pin;
|
|
|
|
|
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
|
|
|
ddc_pin = GMBUS_PIN_DPB;
|
|
|
|
break;
|
|
|
|
case PORT_C:
|
|
|
|
ddc_pin = GMBUS_PIN_DPC;
|
|
|
|
break;
|
|
|
|
case PORT_D:
|
|
|
|
ddc_pin = GMBUS_PIN_DPD;
|
2016-10-11 20:52:46 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(port);
|
|
|
|
ddc_pin = GMBUS_PIN_DPB;
|
|
|
|
break;
|
|
|
|
}
|
2017-08-16 16:45:14 -07:00
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
2020-01-17 16:29:26 +02:00
|
|
|
static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)
|
2017-08-16 16:45:14 -07:00
|
|
|
{
|
2020-01-17 16:29:26 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum port port = encoder->port;
|
2017-08-16 16:45:14 -07:00
|
|
|
u8 ddc_pin;
|
|
|
|
|
2020-01-17 16:29:26 +02:00
|
|
|
ddc_pin = intel_bios_alternate_ddc_pin(encoder);
|
|
|
|
if (ddc_pin) {
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Using DDC pin 0x%x for port %c (VBT)\n",
|
|
|
|
ddc_pin, port_name(port));
|
2020-01-17 16:29:26 +02:00
|
|
|
return ddc_pin;
|
2017-08-16 16:45:14 -07:00
|
|
|
}
|
|
|
|
|
2021-05-11 21:21:43 -07:00
|
|
|
if (IS_ALDERLAKE_S(dev_priv))
|
2021-01-25 06:07:51 -08:00
|
|
|
ddc_pin = adls_port_to_ddc_pin(dev_priv, port);
|
|
|
|
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_DG1)
|
2020-10-06 17:22:07 -07:00
|
|
|
ddc_pin = dg1_port_to_ddc_pin(dev_priv, port);
|
|
|
|
else if (IS_ROCKETLAKE(dev_priv))
|
2020-06-03 14:15:22 -07:00
|
|
|
ddc_pin = rkl_port_to_ddc_pin(dev_priv, port);
|
drm/i915/display: rename display version macros
While converting the rest of the driver to use GRAPHICS_VER() and
MEDIA_VER(), following what was done for display, some discussions went
back on what we did for display:
1) Why is the == comparison special that deserves a separate
macro instead of just getting the version and comparing directly
like is done for >, >=, <=?
2) IS_DISPLAY_RANGE() is weird in that it omits the "_VER" for
brevity. If we remove the current users of IS_DISPLAY_VER(), we
could actually repurpose it for a range check
With (1) there could be an advantage if we used gen_mask since multiple
conditionals be combined by the compiler in a single and instruction and
check the result. However a) INTEL_GEN() doesn't use the mask since it
would make the code bigger everywhere else and b) in the cases it made
sense, it also made sense to convert to the _RANGE() variant.
So here we repurpose IS_DISPLAY_VER() to work with a [ from, to ] range
like was the IS_DISPLAY_RANGE() and convert the current IS_DISPLAY_VER()
users to use == and != operators. Aside from the definition changes,
this was done by the following semantic patch:
@@ expression dev_priv, E1; @@
- !IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) != E1
@@ expression dev_priv, E1; @@
- IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) == E1
@@ expression dev_priv, from, until; @@
- IS_DISPLAY_RANGE(dev_priv, from, until)
+ IS_DISPLAY_VER(dev_priv, from, until)
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
[Jani: Minor conflict resolve while applying.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-4-lucas.demarchi@intel.com
2021-04-12 22:09:53 -07:00
|
|
|
else if (DISPLAY_VER(dev_priv) == 9 && HAS_PCH_TGP(dev_priv))
|
2021-02-09 14:07:45 -05:00
|
|
|
ddc_pin = gen9bc_tgp_port_to_ddc_pin(dev_priv, port);
|
2020-06-03 14:15:22 -07:00
|
|
|
else if (HAS_PCH_MCC(dev_priv))
|
2019-06-14 17:42:10 -07:00
|
|
|
ddc_pin = mcc_port_to_ddc_pin(dev_priv, port);
|
2019-09-18 16:56:25 -07:00
|
|
|
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
|
2019-02-21 13:44:30 -08:00
|
|
|
ddc_pin = icl_port_to_ddc_pin(dev_priv, port);
|
2017-08-16 16:45:14 -07:00
|
|
|
else if (HAS_PCH_CNP(dev_priv))
|
|
|
|
ddc_pin = cnp_port_to_ddc_pin(dev_priv, port);
|
2021-04-07 13:39:45 -07:00
|
|
|
else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
|
2019-02-21 13:44:30 -08:00
|
|
|
ddc_pin = bxt_port_to_ddc_pin(dev_priv, port);
|
|
|
|
else if (IS_CHERRYVIEW(dev_priv))
|
|
|
|
ddc_pin = chv_port_to_ddc_pin(dev_priv, port);
|
2017-08-16 16:45:14 -07:00
|
|
|
else
|
|
|
|
ddc_pin = g4x_port_to_ddc_pin(dev_priv, port);
|
2016-10-11 20:52:46 +03:00
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Using DDC pin 0x%x for port %c (platform default)\n",
|
|
|
|
ddc_pin, port_name(port));
|
2016-10-11 20:52:46 +03:00
|
|
|
|
|
|
|
return ddc_pin;
|
|
|
|
}
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
void intel_infoframe_init(struct intel_digital_port *dig_port)
|
2017-08-18 16:49:55 +03:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv =
|
2020-06-30 21:50:54 -07:00
|
|
|
to_i915(dig_port->base.base.dev);
|
2017-08-18 16:49:55 +03:00
|
|
|
|
|
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = vlv_write_infoframe;
|
|
|
|
dig_port->read_infoframe = vlv_read_infoframe;
|
|
|
|
dig_port->set_infoframes = vlv_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = vlv_infoframes_enabled;
|
2017-08-18 16:49:55 +03:00
|
|
|
} else if (IS_G4X(dev_priv)) {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = g4x_write_infoframe;
|
|
|
|
dig_port->read_infoframe = g4x_read_infoframe;
|
|
|
|
dig_port->set_infoframes = g4x_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = g4x_infoframes_enabled;
|
2017-08-18 16:49:55 +03:00
|
|
|
} else if (HAS_DDI(dev_priv)) {
|
2020-06-10 15:55:10 +08:00
|
|
|
if (intel_bios_is_lspcon_present(dev_priv, dig_port->base.port)) {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = lspcon_write_infoframe;
|
|
|
|
dig_port->read_infoframe = lspcon_read_infoframe;
|
|
|
|
dig_port->set_infoframes = lspcon_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = lspcon_infoframes_enabled;
|
2018-10-12 11:53:11 +05:30
|
|
|
} else {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = hsw_write_infoframe;
|
|
|
|
dig_port->read_infoframe = hsw_read_infoframe;
|
|
|
|
dig_port->set_infoframes = hsw_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = hsw_infoframes_enabled;
|
2018-10-12 11:53:11 +05:30
|
|
|
}
|
2017-08-18 16:49:55 +03:00
|
|
|
} else if (HAS_PCH_IBX(dev_priv)) {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = ibx_write_infoframe;
|
|
|
|
dig_port->read_infoframe = ibx_read_infoframe;
|
|
|
|
dig_port->set_infoframes = ibx_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = ibx_infoframes_enabled;
|
2017-08-18 16:49:55 +03:00
|
|
|
} else {
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->write_infoframe = cpt_write_infoframe;
|
|
|
|
dig_port->read_infoframe = cpt_read_infoframe;
|
|
|
|
dig_port->set_infoframes = cpt_set_infoframes;
|
|
|
|
dig_port->infoframes_enabled = cpt_infoframes_enabled;
|
2017-08-18 16:49:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
|
2012-10-26 19:05:52 -02:00
|
|
|
struct intel_connector *intel_connector)
|
2009-01-02 13:33:00 -08:00
|
|
|
{
|
2012-10-26 19:05:47 -02:00
|
|
|
struct drm_connector *connector = &intel_connector->base;
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
|
|
|
|
struct intel_encoder *intel_encoder = &dig_port->base;
|
2012-10-26 19:05:47 -02:00
|
|
|
struct drm_device *dev = intel_encoder->base.dev;
|
2016-07-04 11:34:36 +01:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-11-28 16:01:30 +01:00
|
|
|
struct i2c_adapter *ddc;
|
2017-11-09 17:24:34 +02:00
|
|
|
enum port port = intel_encoder->port;
|
2019-08-14 12:45:00 +02:00
|
|
|
struct cec_connector_info conn_info;
|
2010-09-15 12:03:59 +01:00
|
|
|
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Adding HDMI connector on [ENCODER:%d:%s]\n",
|
|
|
|
intel_encoder->base.base.id, intel_encoder->base.name);
|
2016-06-03 12:17:43 +03:00
|
|
|
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) < 12 && drm_WARN_ON(dev, port == PORT_A))
|
2019-11-08 13:42:51 -08:00
|
|
|
return;
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
if (drm_WARN(dev, dig_port->max_lanes < 4,
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
"Not enough lanes (%d) for HDMI on [ENCODER:%d:%s]\n",
|
2020-06-30 21:50:54 -07:00
|
|
|
dig_port->max_lanes, intel_encoder->base.base.id,
|
drm/i915/display/hdmi: 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.
@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-14-pankaj.laxminarayan.bharadiya@intel.com
2020-01-28 23:45:55 +05:30
|
|
|
intel_encoder->base.name))
|
2015-12-08 19:59:38 +02:00
|
|
|
return;
|
|
|
|
|
2020-01-17 16:29:26 +02:00
|
|
|
intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(intel_encoder);
|
2019-11-28 16:01:30 +01:00
|
|
|
ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
|
|
|
|
|
|
|
|
drm_connector_init_with_ddc(dev, connector,
|
|
|
|
&intel_hdmi_connector_funcs,
|
|
|
|
DRM_MODE_CONNECTOR_HDMIA,
|
|
|
|
ddc);
|
2009-01-02 13:33:00 -08:00
|
|
|
drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
|
|
|
|
|
2012-01-28 14:49:26 +01:00
|
|
|
connector->interlace_allowed = 1;
|
2009-01-02 13:33:00 -08:00
|
|
|
connector->doublescan_allowed = 0;
|
2013-09-25 16:45:40 +01:00
|
|
|
connector->stereo_allowed = 1;
|
2012-07-12 20:08:18 +02:00
|
|
|
|
drm/i915/display: Simplify GLK display version tests
GLK has always been a bit of a special case since it reports INTEL_GEN()
as 9, but has version 10 display IP. Now we can properly represent the
display version as 10 and simplify the display generation tests
throughout the display code.
Aside from manually adding the version to the glk_info structure, the
rest of this patch is generated with a Coccinelle semantic patch. Note
that we also need to switch any code that matches gen10 today but *not*
GLK to be CNL-specific:
@@ expression dev_priv; @@
- DISPLAY_VER(dev_priv) > 9
+ DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
(
- DISPLAY_VER(dev_priv) >= 10 && E
+ (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
|
- DISPLAY_VER(dev_priv) >= 10
+ DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
|
- IS_DISPLAY_RANGE(dev_priv, 10, E)
+ IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
)
@@ expression dev_priv, E, E2; @@
(
- (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
+ E || IS_DISPLAY_VER(dev_priv, 10)
|
- E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
+ E || E2 || IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 10)
|
- (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_VER(dev_priv, 10)
)
@@ expression dev_priv; @@
- (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
+ IS_DISPLAY_VER(dev_priv, 9)
@@ expression dev_priv; @@
(
- !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) < 10
|
- (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
+ DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
+ E || DISPLAY_VER(dev_priv) >= 10
@@ expression dev_priv, E; @@
- (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
+ IS_DISPLAY_RANGE(dev_priv, 10, E)
@@ expression dev_priv; @@
(
- DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) || IS_GEN9_LP(dev_priv)
+ DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
|
- IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
+ IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
)
@@ expression dev_priv, E; @@
- !(DISPLAY_VER(dev_priv) >= E)
+ DISPLAY_VER(dev_priv) < E
v2:
- Convert gen10 conditions that don't include GLK into CNL conditions.
(Ville)
v3:
- Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl." (Ville)
v3.1:
- Manually re-add the ".display.version = 10" to glk_info after
regenerating patch via Coccinelle.
v4:
- Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Cc: Ville Syrjälä <ville.syrjala@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210322233840.4056851-1-matthew.d.roper@intel.com
2021-03-22 16:38:40 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 10)
|
2017-07-21 20:55:09 +05:30
|
|
|
connector->ycbcr_420_allowed = true;
|
|
|
|
|
2020-02-05 20:35:43 +02:00
|
|
|
intel_connector->polled = DRM_CONNECTOR_POLL_HPD;
|
2009-01-02 13:33:00 -08:00
|
|
|
|
2016-10-13 11:02:52 +01:00
|
|
|
if (HAS_DDI(dev_priv))
|
2012-10-26 19:05:51 -02:00
|
|
|
intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
|
|
|
|
else
|
|
|
|
intel_connector->get_hw_state = intel_connector_get_hw_state;
|
2012-10-26 19:05:47 -02:00
|
|
|
|
|
|
|
intel_hdmi_add_properties(intel_hdmi, connector);
|
|
|
|
|
2019-02-16 23:06:50 +05:30
|
|
|
intel_connector_attach_encoder(intel_connector, intel_encoder);
|
|
|
|
intel_hdmi->attached_connector = intel_connector;
|
|
|
|
|
2018-01-18 11:18:05 +05:30
|
|
|
if (is_hdcp_supported(dev_priv, port)) {
|
2021-01-11 13:41:11 +05:30
|
|
|
int ret = intel_hdcp_init(intel_connector, dig_port,
|
2018-01-08 14:55:42 -05:00
|
|
|
&intel_hdmi_hdcp_shim);
|
|
|
|
if (ret)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"HDCP init failed, skipping.\n");
|
2018-01-08 14:55:42 -05:00
|
|
|
}
|
|
|
|
|
2012-10-26 19:05:47 -02:00
|
|
|
/* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
|
|
|
|
* 0xd. Failure to do so will result in spurious interrupts being
|
|
|
|
* generated on the port when a cable is not attached.
|
|
|
|
*/
|
2018-06-14 21:05:00 +03:00
|
|
|
if (IS_G45(dev_priv)) {
|
drm/i915/hdmi: 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/c89e66aaca33a1e26fa1372172be41da0ee1c62f.1579871655.git.jani.nikula@intel.com
2020-01-24 15:25:41 +02:00
|
|
|
u32 temp = intel_de_read(dev_priv, PEG_BAND_GAP_DATA);
|
|
|
|
intel_de_write(dev_priv, PEG_BAND_GAP_DATA,
|
|
|
|
(temp & ~0xf) | 0xd);
|
2012-10-26 19:05:47 -02:00
|
|
|
}
|
2018-07-04 17:08:17 +02:00
|
|
|
|
2019-08-14 12:45:00 +02:00
|
|
|
cec_fill_conn_info_from_drm(&conn_info, connector);
|
|
|
|
|
|
|
|
intel_hdmi->cec_notifier =
|
|
|
|
cec_notifier_conn_register(dev->dev, port_identifier(port),
|
|
|
|
&conn_info);
|
2018-07-04 17:08:17 +02:00
|
|
|
if (!intel_hdmi->cec_notifier)
|
drm/i915/hdmi: 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,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fbc5396e6a512195b38c24b113aeebe23755c716.1584714939.git.jani.nikula@intel.com
2020-03-20 16:36:31 +02:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "CEC notifier get failed\n");
|
2012-10-26 19:05:47 -02:00
|
|
|
}
|
|
|
|
|
2020-12-18 16:07:21 +05:30
|
|
|
/*
|
|
|
|
* intel_hdmi_dsc_get_slice_height - get the dsc slice_height
|
|
|
|
* @vactive: Vactive of a display mode
|
|
|
|
*
|
|
|
|
* @return: appropriate dsc slice height for a given mode.
|
|
|
|
*/
|
|
|
|
int intel_hdmi_dsc_get_slice_height(int vactive)
|
|
|
|
{
|
|
|
|
int slice_height;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Slice Height determination : HDMI2.1 Section 7.7.5.2
|
|
|
|
* Select smallest slice height >=96, that results in a valid PPS and
|
|
|
|
* requires minimum padding lines required for final slice.
|
|
|
|
*
|
|
|
|
* Assumption : Vactive is even.
|
|
|
|
*/
|
|
|
|
for (slice_height = 96; slice_height <= vactive; slice_height += 2)
|
|
|
|
if (vactive % slice_height == 0)
|
|
|
|
return slice_height;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* intel_hdmi_dsc_get_num_slices - get no. of dsc slices based on dsc encoder
|
|
|
|
* and dsc decoder capabilities
|
|
|
|
*
|
|
|
|
* @crtc_state: intel crtc_state
|
|
|
|
* @src_max_slices: maximum slices supported by the DSC encoder
|
|
|
|
* @src_max_slice_width: maximum slice width supported by DSC encoder
|
|
|
|
* @hdmi_max_slices: maximum slices supported by sink DSC decoder
|
|
|
|
* @hdmi_throughput: maximum clock per slice (MHz) supported by HDMI sink
|
|
|
|
*
|
|
|
|
* @return: num of dsc slices that can be supported by the dsc encoder
|
|
|
|
* and decoder.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
intel_hdmi_dsc_get_num_slices(const struct intel_crtc_state *crtc_state,
|
|
|
|
int src_max_slices, int src_max_slice_width,
|
|
|
|
int hdmi_max_slices, int hdmi_throughput)
|
|
|
|
{
|
|
|
|
/* Pixel rates in KPixels/sec */
|
|
|
|
#define HDMI_DSC_PEAK_PIXEL_RATE 2720000
|
|
|
|
/*
|
|
|
|
* Rates at which the source and sink are required to process pixels in each
|
|
|
|
* slice, can be two levels: either atleast 340000KHz or atleast 40000KHz.
|
|
|
|
*/
|
|
|
|
#define HDMI_DSC_MAX_ENC_THROUGHPUT_0 340000
|
|
|
|
#define HDMI_DSC_MAX_ENC_THROUGHPUT_1 400000
|
|
|
|
|
|
|
|
/* Spec limits the slice width to 2720 pixels */
|
|
|
|
#define MAX_HDMI_SLICE_WIDTH 2720
|
|
|
|
int kslice_adjust;
|
|
|
|
int adjusted_clk_khz;
|
|
|
|
int min_slices;
|
|
|
|
int target_slices;
|
|
|
|
int max_throughput; /* max clock freq. in khz per slice */
|
|
|
|
int max_slice_width;
|
|
|
|
int slice_width;
|
|
|
|
int pixel_clock = crtc_state->hw.adjusted_mode.crtc_clock;
|
|
|
|
|
|
|
|
if (!hdmi_throughput)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Slice Width determination : HDMI2.1 Section 7.7.5.1
|
|
|
|
* kslice_adjust factor for 4:2:0, and 4:2:2 formats is 0.5, where as
|
|
|
|
* for 4:4:4 is 1.0. Multiplying these factors by 10 and later
|
|
|
|
* dividing adjusted clock value by 10.
|
|
|
|
*/
|
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444 ||
|
|
|
|
crtc_state->output_format == INTEL_OUTPUT_FORMAT_RGB)
|
|
|
|
kslice_adjust = 10;
|
|
|
|
else
|
|
|
|
kslice_adjust = 5;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* As per spec, the rate at which the source and the sink process
|
|
|
|
* the pixels per slice are at two levels: atleast 340Mhz or 400Mhz.
|
|
|
|
* This depends upon the pixel clock rate and output formats
|
|
|
|
* (kslice adjust).
|
|
|
|
* If pixel clock * kslice adjust >= 2720MHz slices can be processed
|
|
|
|
* at max 340MHz, otherwise they can be processed at max 400MHz.
|
|
|
|
*/
|
|
|
|
|
|
|
|
adjusted_clk_khz = DIV_ROUND_UP(kslice_adjust * pixel_clock, 10);
|
|
|
|
|
|
|
|
if (adjusted_clk_khz <= HDMI_DSC_PEAK_PIXEL_RATE)
|
|
|
|
max_throughput = HDMI_DSC_MAX_ENC_THROUGHPUT_0;
|
|
|
|
else
|
|
|
|
max_throughput = HDMI_DSC_MAX_ENC_THROUGHPUT_1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Taking into account the sink's capability for maximum
|
|
|
|
* clock per slice (in MHz) as read from HF-VSDB.
|
|
|
|
*/
|
|
|
|
max_throughput = min(max_throughput, hdmi_throughput * 1000);
|
|
|
|
|
|
|
|
min_slices = DIV_ROUND_UP(adjusted_clk_khz, max_throughput);
|
|
|
|
max_slice_width = min(MAX_HDMI_SLICE_WIDTH, src_max_slice_width);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Keep on increasing the num of slices/line, starting from min_slices
|
|
|
|
* per line till we get such a number, for which the slice_width is
|
|
|
|
* just less than max_slice_width. The slices/line selected should be
|
|
|
|
* less than or equal to the max horizontal slices that the combination
|
|
|
|
* of PCON encoder and HDMI decoder can support.
|
|
|
|
*/
|
|
|
|
slice_width = max_slice_width;
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (min_slices <= 1 && src_max_slices >= 1 && hdmi_max_slices >= 1)
|
|
|
|
target_slices = 1;
|
|
|
|
else if (min_slices <= 2 && src_max_slices >= 2 && hdmi_max_slices >= 2)
|
|
|
|
target_slices = 2;
|
|
|
|
else if (min_slices <= 4 && src_max_slices >= 4 && hdmi_max_slices >= 4)
|
|
|
|
target_slices = 4;
|
|
|
|
else if (min_slices <= 8 && src_max_slices >= 8 && hdmi_max_slices >= 8)
|
|
|
|
target_slices = 8;
|
|
|
|
else if (min_slices <= 12 && src_max_slices >= 12 && hdmi_max_slices >= 12)
|
|
|
|
target_slices = 12;
|
|
|
|
else if (min_slices <= 16 && src_max_slices >= 16 && hdmi_max_slices >= 16)
|
|
|
|
target_slices = 16;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
slice_width = DIV_ROUND_UP(crtc_state->hw.adjusted_mode.hdisplay, target_slices);
|
|
|
|
if (slice_width >= max_slice_width)
|
|
|
|
min_slices = target_slices + 1;
|
|
|
|
} while (slice_width >= max_slice_width);
|
|
|
|
|
|
|
|
return target_slices;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* intel_hdmi_dsc_get_bpp - get the appropriate compressed bits_per_pixel based on
|
|
|
|
* source and sink capabilities.
|
|
|
|
*
|
|
|
|
* @src_fraction_bpp: fractional bpp supported by the source
|
|
|
|
* @slice_width: dsc slice width supported by the source and sink
|
|
|
|
* @num_slices: num of slices supported by the source and sink
|
|
|
|
* @output_format: video output format
|
|
|
|
* @hdmi_all_bpp: sink supports decoding of 1/16th bpp setting
|
|
|
|
* @hdmi_max_chunk_bytes: max bytes in a line of chunks supported by sink
|
|
|
|
*
|
|
|
|
* @return: compressed bits_per_pixel in step of 1/16 of bits_per_pixel
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
intel_hdmi_dsc_get_bpp(int src_fractional_bpp, int slice_width, int num_slices,
|
|
|
|
int output_format, bool hdmi_all_bpp,
|
|
|
|
int hdmi_max_chunk_bytes)
|
|
|
|
{
|
|
|
|
int max_dsc_bpp, min_dsc_bpp;
|
|
|
|
int target_bytes;
|
|
|
|
bool bpp_found = false;
|
|
|
|
int bpp_decrement_x16;
|
|
|
|
int bpp_target;
|
|
|
|
int bpp_target_x16;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get min bpp and max bpp as per Table 7.23, in HDMI2.1 spec
|
|
|
|
* Start with the max bpp and keep on decrementing with
|
|
|
|
* fractional bpp, if supported by PCON DSC encoder
|
|
|
|
*
|
|
|
|
* for each bpp we check if no of bytes can be supported by HDMI sink
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Assuming: bpc as 8*/
|
|
|
|
if (output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {
|
|
|
|
min_dsc_bpp = 6;
|
|
|
|
max_dsc_bpp = 3 * 4; /* 3*bpc/2 */
|
|
|
|
} else if (output_format == INTEL_OUTPUT_FORMAT_YCBCR444 ||
|
|
|
|
output_format == INTEL_OUTPUT_FORMAT_RGB) {
|
|
|
|
min_dsc_bpp = 8;
|
|
|
|
max_dsc_bpp = 3 * 8; /* 3*bpc */
|
|
|
|
} else {
|
|
|
|
/* Assuming 4:2:2 encoding */
|
|
|
|
min_dsc_bpp = 7;
|
|
|
|
max_dsc_bpp = 2 * 8; /* 2*bpc */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Taking into account if all dsc_all_bpp supported by HDMI2.1 sink
|
|
|
|
* Section 7.7.34 : Source shall not enable compressed Video
|
|
|
|
* Transport with bpp_target settings above 12 bpp unless
|
|
|
|
* DSC_all_bpp is set to 1.
|
|
|
|
*/
|
|
|
|
if (!hdmi_all_bpp)
|
|
|
|
max_dsc_bpp = min(max_dsc_bpp, 12);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The Sink has a limit of compressed data in bytes for a scanline,
|
|
|
|
* as described in max_chunk_bytes field in HFVSDB block of edid.
|
|
|
|
* The no. of bytes depend on the target bits per pixel that the
|
|
|
|
* source configures. So we start with the max_bpp and calculate
|
|
|
|
* the target_chunk_bytes. We keep on decrementing the target_bpp,
|
|
|
|
* till we get the target_chunk_bytes just less than what the sink's
|
|
|
|
* max_chunk_bytes, or else till we reach the min_dsc_bpp.
|
|
|
|
*
|
|
|
|
* The decrement is according to the fractional support from PCON DSC
|
|
|
|
* encoder. For fractional BPP we use bpp_target as a multiple of 16.
|
|
|
|
*
|
|
|
|
* bpp_target_x16 = bpp_target * 16
|
|
|
|
* So we need to decrement by {1, 2, 4, 8, 16} for fractional bpps
|
|
|
|
* {1/16, 1/8, 1/4, 1/2, 1} respectively.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bpp_target = max_dsc_bpp;
|
|
|
|
|
|
|
|
/* src does not support fractional bpp implies decrement by 16 for bppx16 */
|
|
|
|
if (!src_fractional_bpp)
|
|
|
|
src_fractional_bpp = 1;
|
|
|
|
bpp_decrement_x16 = DIV_ROUND_UP(16, src_fractional_bpp);
|
|
|
|
bpp_target_x16 = (bpp_target * 16) - bpp_decrement_x16;
|
|
|
|
|
|
|
|
while (bpp_target_x16 > (min_dsc_bpp * 16)) {
|
|
|
|
int bpp;
|
|
|
|
|
|
|
|
bpp = DIV_ROUND_UP(bpp_target_x16, 16);
|
|
|
|
target_bytes = DIV_ROUND_UP((num_slices * slice_width * bpp), 8);
|
|
|
|
if (target_bytes <= hdmi_max_chunk_bytes) {
|
|
|
|
bpp_found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
bpp_target_x16 -= bpp_decrement_x16;
|
|
|
|
}
|
|
|
|
if (bpp_found)
|
|
|
|
return bpp_target_x16;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|