; \
> + (INTEL_DEVID(dev_priv) & DG2_MBD_CONFIG_MASK) ==
> DG2_MBD_CONFIG_VAL)
No. Please don't do *any* magic masking or comparison of PCI ID bits or
bitfields.
BR,
Jani.
> #define IS_ADLS_RPLS(dev_priv) \
> IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)
> #define IS_ADLP_N(dev_priv) \
--
Jani Nikula, Intel Open Source Graphics Center
On Thu, 19 May 2022, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin
>
> As agreed on the mailing list and between the maintainers more consensus is
> needed on the topic.
Acked-by: Jani Nikula
>
> Tvrtko Ursulin (7):
> Revert "drm/i915: Drop has_psr from device
On Wed, 18 May 2022, Hans de Goede wrote:
> Hi,
>
> On 5/18/22 10:55, Jani Nikula wrote:
>> On Tue, 17 May 2022, Hans de Goede wrote:
>>> ATM on x86 laptops where we want userspace to use the acpi_video backlight
>>> device we often register both
On Wed, 18 May 2022, Jani Nikula wrote:
> On Wed, 18 May 2022, Michal Wajdeczko wrote:
>> On 18.05.2022 13:33, Jani Nikula wrote:
>>> From: Borislav Petkov
>>>
>>> Fix:
>>>
>>> In file included from :0:0:
>>> drivers/g
On Wed, 18 May 2022, Jani Nikula wrote:
> On Wed, 18 May 2022, Ville Syrjälä wrote:
>> On Wed, May 18, 2022 at 02:33:14PM +0300, Jani Nikula wrote:
>>> Use REG_GENMASK() and REG_FIELD_PREP() to avoid errors due to
>>> -fsanitize=shift.
>>
>> I p
+#define PORT_CLK_SEL_WRPLL2 (5u << 29)
> +#define PORT_CLK_SEL_NONE (7u << 29)
> #define PORT_CLK_SEL_MASK (7 << 29)
>
> /* On ICL+ this is the same as PORT_CLK_SEL, but all bits change. */
> #define DDI_CLK_SEL(port)PORT_CLK_SEL(port)
> #define DDI_CLK_SEL_NONE(0x0 << 28)
> -#define DDI_CLK_SEL_MG (0x8 << 28)
> -#define DDI_CLK_SEL_TBT_162 (0xC << 28)
> -#define DDI_CLK_SEL_TBT_270 (0xD << 28)
> -#define DDI_CLK_SEL_TBT_540 (0xE << 28)
> -#define DDI_CLK_SEL_TBT_810 (0xF << 28)
> +#define DDI_CLK_SEL_MG (0x8u << 28)
> +#define DDI_CLK_SEL_TBT_162 (0xCu << 28)
> +#define DDI_CLK_SEL_TBT_270 (0xDu << 28)
> +#define DDI_CLK_SEL_TBT_540 (0xEu << 28)
> +#define DDI_CLK_SEL_TBT_810 (0xFu << 28)
> #define DDI_CLK_SEL_MASK(0xF << 28)
>
> /* Transcoder clock selection */
--
Jani Nikula, Intel Open Source Graphics Center
On Wed, 18 May 2022, Michal Wajdeczko wrote:
> On 18.05.2022 13:33, Jani Nikula wrote:
>> From: Borislav Petkov
>>
>> Fix:
>>
>> In file included from :0:0:
>> drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function ‘intel_guc_send_mmio’:
>> ./.
On Wed, 18 May 2022, Ville Syrjälä wrote:
> On Wed, May 18, 2022 at 02:33:14PM +0300, Jani Nikula wrote:
>> Use REG_GENMASK() and REG_FIELD_PREP() to avoid errors due to
>> -fsanitize=shift.
>
> I presume it's just unhappy about shifting into the sign bit?
Yeah, and ap
ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE :
> -PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE;
> -}
> -
> -static u32 man_trk_ctl_continuos_full_frame(struct drm_i915_private
> *dev_priv)
> -{
> - return IS_ALDERLAKE_P(dev_priv) ?
> -ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME :
> -PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME;
> -}
> -
> static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp)
> {
> struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> @@ -1911,6 +2001,8 @@ static void _intel_psr_post_plane_update(const struct
> intel_atomic_state *state,
>
> drm_WARN_ON(_priv->drm, psr->enabled &&
> !crtc_state->active_planes);
>
> + intel_psr_stats_update(intel_dp,
> crtc_state->psr2_man_track_ctl);
> +
> /* Only enable if there is active planes */
> if (!psr->enabled && crtc_state->active_planes)
> intel_psr_enable_locked(intel_dp, crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.h
> b/drivers/gpu/drm/i915/display/intel_psr.h
> index 2ac3a465..cda50e423ec9 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr.h
> @@ -58,4 +58,6 @@ void intel_psr_resume(struct intel_dp *intel_dp);
> void intel_psr_lock(const struct intel_crtc_state *crtc_state);
> void intel_psr_unlock(const struct intel_crtc_state *crtc_state);
>
> +void intel_psr_stats_enable_stats(struct intel_dp *intel_dp);
> +void intel_psr_stats_disable_stats(struct intel_dp *intel_dp);
> #endif /* __INTEL_PSR_H__ */
--
Jani Nikula, Intel Open Source Graphics Center
;int num_entries, int ignore_idx);
> +void skl_write_zero_plane_wm(struct intel_plane *plane,
> + const struct intel_crtc_state *crtc_state);
> void skl_write_plane_wm(struct intel_plane *plane,
> const struct intel_crtc_state *crtc_state);
> void skl_write_cursor_wm(struct intel_plane *plane,
--
Jani Nikula, Intel Open Source Graphics Center
x0 << 28)
> -#define DDI_CLK_SEL_MG (0x8 << 28)
> -#define DDI_CLK_SEL_TBT_162 (0xC << 28)
> -#define DDI_CLK_SEL_TBT_270 (0xD << 28)
> -#define DDI_CLK_SEL_TBT_540 (0xE << 28)
> -#define DDI_CLK_SEL_TBT_810 (0xF << 28)
> +#define DDI_CLK_SEL_MG (0x8u << 28)
> +#define DDI_CLK_SEL_TBT_162 (0xCu << 28)
> +#define DDI_CLK_SEL_TBT_270 (0xDu << 28)
> +#define DDI_CLK_SEL_TBT_540 (0xEu << 28)
> +#define DDI_CLK_SEL_TBT_810 (0xFu << 28)
> #define DDI_CLK_SEL_MASK(0xF << 28)
>
> /* Transcoder clock selection */
--
Jani Nikula, Intel Open Source Graphics Center
I guess not yet.
>
>> It could/should at least be in linux-next so that other people
>> don't waste time on it.
>
> -ETOOMANYPATCHES I guess. :-\
Yeah, sorry about that.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/104122/
--
Jani Nikula, Intel Open Source Graphics Center
: Joonas Lahtinen
Cc: Tvrtko Ursulin
Cc: Ruiqi GONG
Cc: Randy Dunlap
Signed-off-by: Borislav Petkov
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 2 +-
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 2 +-
drivers/gpu/drm/i915/gt/uc/abi
Use REG_GENMASK() and REG_FIELD_PREP() to avoid errors due to
-fsanitize=shift.
References: https://lore.kernel.org/r/20220405151517.29753-12...@alien8.de
Reported-by: Borislav Petkov
Reported-by: Ruiqi GONG
Cc: Randy Dunlap
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_reg.h | 32
On Wed, 18 May 2022, Hans de Goede wrote:
> Hi,
>
> On 5/18/22 10:44, Jani Nikula wrote:
>> On Tue, 17 May 2022, Hans de Goede wrote:
>>> Hi All,
>>>
>>> As mentioned in my RFC titled "drm/kms: control display brightness through
>>> dr
n it is false.
> */
Frankly, I think the boolean native parameter here, and at the call
sites, is confusing, and the slightly different explanations in the
commit message and comment here aren't helping.
I suggest adding a separate function that the native backlight drivers
should use. I think it's more obvious all around, and easier to document
too.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
ivers/platform/x86/intel/oaktrail.c | 2 +-
> drivers/platform/x86/msi-laptop.c | 2 +-
> drivers/platform/x86/msi-wmi.c| 2 +-
> drivers/platform/x86/samsung-laptop.c | 2 +-
> drivers/platform/x86/sony-laptop.c| 2 +-
> drivers/platform/x86/thinkpad_acpi.c | 4 +-
> drivers/platform/x86/toshiba_acpi.c | 2 +-
> include/acpi/video.h | 8 ++-
> 28 files changed, 156 insertions(+), 84 deletions(-)
--
Jani Nikula, Intel Open Source Graphics Center
A bit unsure if I can appreciate all the subtleties here, but
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 17 +
> drivers/gpu/drm/i915/display/intel_dpll.c| 6 ++
> 2 files changed, 3 insertions(+), 20 deletio
DIVSEL_SHIFT;
> - phaseinc = (temp & SBI_SSCDIVINTPHASE_INCVAL_MASK) >>
> + p.phaseinc = (temp & SBI_SSCDIVINTPHASE_INCVAL_MASK) >>
> SBI_SSCDIVINTPHASE_INCVAL_SHIFT;
>
> temp = intel_sbi_read(dev_priv, SBI_SSCAUXDIV6, SBI_ICLK);
> - auxdiv = (temp & SBI_SSCAUXDIV_FINALDIV2SEL_MASK) >>
> + p.auxdiv = (temp & SBI_SSCAUXDIV_FINALDIV2SEL_MASK) >>
> SBI_SSCAUXDIV_FINALDIV2SEL_SHIFT;
>
> mutex_unlock(_priv->sb_lock);
>
> - desired_divisor = (divsel + 2) * iclk_pi_range + phaseinc;
> + p.desired_divisor = (p.divsel + 2) * p.iclk_pi_range + p.phaseinc;
>
> - return DIV_ROUND_CLOSEST(iclk_virtual_root_freq,
> - desired_divisor << auxdiv);
> + return lpt_iclkip_freq();
> }
>
> /* Implements 3 different sequences from BSpec chapter "Display iCLK
--
Jani Nikula, Intel Open Source Graphics Center
ot;intel_pch_display.h"
> +#include "intel_pch_refclk.h"
Seems out of place.
Otherwise,
Reviewed-by: Jani Nikula
>
> /* Here's the desired hotplug mode */
> #define ADPA_HOTPLUG_BITS (ADPA_CRT_HOTPLUG_PERIOD_128 | \
> diff --git a/drivers/gpu/drm/i
> us the exact same port_clock that we fed in).
>
> v2: Add the prototype
>
> Signed-off-by: Ville Syrjälä
Okay, seems like intel_crtc_dotclock() might be in the wrong place now,
but okay for now.
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c
o make it less
> confusing.
>
> Signed-off-by: Ville Syrjälä
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 22 +---
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display
On Tue, 03 May 2022, Ville Syrjala wrote:
> From: Ville Syrjälä
>
> Rename some of the 'pipe_config's to the more modern
> 'crtc_state'.
>
> Signed-off-by: Ville Syrjälä
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 62 ++
o
> worry about whether it can actually be extracted from eg. the crtc
> state passed in.
>
> Signed-off-by: Ville Syrjälä
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 48 ++--
> 1 file changed, 25 insertions(+), 23 delet
e if is not what it says on the box. I guess it should be
fine though since we only populate the values if pfit is enabled
AFAICT. (Maybe this is what we should do in general to ensure we're not
reading stuff to state when some feature isn't enabled?)
With the commit message amended,
Reviewed-by: Jan
intel_crtc_state
> *current_config,
> #undef PIPE_CONF_CHECK_FLAGS
> #undef PIPE_CONF_CHECK_CLOCK_FUZZY
> #undef PIPE_CONF_CHECK_COLOR_LUT
> +#undef PIPE_CONF_CHECK_TIMINGS
> #undef PIPE_CONF_QUIRK
>
> return ret;
--
Jani Nikula, Intel Open Source Graphics Center
On Tue, 03 May 2022, Ville Syrjala wrote:
> From: Ville Syrjälä
>
> Deduplicate the crtc_ timigns comparisons.
>
> Signed-off-by: Ville Syrjälä
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 45
> 1 file chang
d) into the higher level code. In
> addition we'll get the full state dump as well, which should
> hopefully have enough information to figure out what went wrong.
>
> Reviewed-by: Jani Nikula
Yup.
> Signed-off-by: Ville Syrjälä
> ---
> drivers/gpu
oncile those conflicting requirements...
>
> v2: s/return/goto/ in error handling
>
> Signed-off-by: Ville Syrjälä
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 9 +
> drivers/gpu/drm/i915/display/intel_dpll.c| 3 ---
>
On Tue, 03 May 2022, Ville Syrjala wrote:
> From: Ville Syrjälä
>
> Split the DPLL state computation into a separate function
> from the current .get_dplls() which currently serves a dual duty
> by also reserving the shared DPLLs.
>
> v2: s/false/-EINVAL/ (Jani)
>
> Cc
ort && !dig_port->connected(encoder) &&
> + intel_phy_is_tc(dev_priv,
> + intel_port_to_phy(dev_priv, encoder->port))) {
> + drm_dbg_atomic(_priv->drm,
> +"[CONNECTOR:%d:%s] is not connected; rejecting
> the modeset\n",
&g
ose the currently using bpc by crtc.
>> It is very useful for verifying whether we enter the correct output color
>> depth
>> from IGT.
>>
>> This patch will also add the connector's max supported bpc to
>> "i915_display_info" debugfs.
>>
>
an ack to merge via drm-misc-next? :)
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
On Tue, 10 May 2022, "Nautiyal, Ankit K" wrote:
> LGTM.
>
> Reviewed-by: Ankit Nautiyal
Thanks for the review, pushed the lot already on Friday.
BR,
Jani.
>
> Regards,
>
> Ankit
>
> On 5/9/2022 5:33 PM, Jani Nikula wrote:
>> Introduce new opaque t
There's an early return for !engine->kernel_context.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/display/intel_overlay.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c
b/drivers/gpu/drm/i915/display/intel_overlay.c
index ee46561b5
drm_err(drm, "Failed to %s GuC RC (%pe)\n",
>> -str_enable_disable(enable), ERR_PTR(ret));
>> + i915_probe_error(guc_to_gt(guc)->i915, "Failed to %s GuC RC
>> (%pe)\n",
>> + str_enable_disable(enable), ERR_PTR(ret));
>> return ret;
>> }
>>
>> --
>> 2.35.1
>>
>
--
Jani Nikula, Intel Open Source Graphics Center
On Mon, 16 May 2022, Jani Nikula wrote:
> On Sat, 14 May 2022, Vinay Belgaumkar wrote:
>> SLPC min/max frequency updates require H2G calls. We are seeing
>> timeouts when GuC channel is backed up and it is unable to respond
>> in a timely fashion causing warn
hat
> @@ -231,8 +255,12 @@ static void slpc_boost_work(struct work_struct *work)
>*/
> mutex_lock(>lock);
> if (atomic_read(>num_waiters)) {
> - slpc_force_min_freq(slpc, slpc->boost_freq);
> - slpc->num_boosts++;
> + err = slpc_fo
On Thu, 12 May 2022, Ville Syrjälä wrote:
> On Thu, May 12, 2022 at 07:16:38PM +0300, Jani Nikula wrote:
>> Need to use pipe_name(pipe) instead of pipe directly.
>>
>> Fixes: 1f31e35f2e88 ("drm/i915/audio: unify audio codec enable/disable debug
>> logging"
Need to use pipe_name(pipe) instead of pipe directly.
Fixes: 1f31e35f2e88 ("drm/i915/audio: unify audio codec enable/disable debug
logging")
Cc: Ville Syrjälä
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/display/intel_audio.c | 4 ++--
1 file changed, 2 insertions(+), 2
(Rodrigo)
> v4: Move out i915_pcode_init() to a separate patch (Tvrtko)
> Remove duplicated drm_err/drm_dbg from intel_pcode_init() (Tvrtko)
Couple of nitpicks inline, and not insisting on changing. Basically ack
on this from me.
>
> Cc: Tvrtko Ursulin
> Cc: Jani Nikula
>
d code paths in hsw_crtc_enable, which
needs cleanup.
BR,
Jani.
>
> No functional changes here.
>
> Suggested-by: Jani Nikula
> Cc: Ville Syrjälä
> Cc: Jani Nikula
> Signed-off-by: Manasi Navare
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 74 ++
r.c:2479:35:unsigned int
> enum intel_display_power_domain
> drivers/gpu/drm/i915/display/intel_display_power.c:2479:35:unsigned int
> enum aux_ch
>
> Fixes: 979e1b32e0e2 ("drm/i915: Sanitize the port -> DDI/AUX power domain
> mapping for each platform")
> Repo
The arrays are static const, but the pointer shouldn't be static.
Fixes: 3d832f370d16 ("drm/i915/uc: Allow platforms to have GuC but not HuC")
Cc: John Harrison
Cc: Lucas De Marchi
Cc: Daniele Ceraolo Spurio
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
We'll need to propagate drm_edid everywhere.
v3: s/edid/drm_edid/ in comment too (Ankit)
Signed-off-by: Jani Nikula
Reviewed-by: Ankit Nautiyal
---
drivers/gpu/drm/drm_edid.c | 97 ++
1 file changed, 47 insertions(+), 50 deletions(-)
diff --git a/drivers
We'll need to propagate drm_edid everywhere.
v3: Rebase
Signed-off-by: Jani Nikula
Reviewed-by: Ankit Nautiyal
---
drivers/gpu/drm/drm_edid.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
We'll need to propagate drm_edid everywhere.
v3: Update comment to refer to update_display_info() (Ankit)
v2: Use drm_edid_legacy_init()
Signed-off-by: Jani Nikula
Reviewed-by: Ankit Nautiyal
---
drivers/gpu/drm/drm_edid.c | 50 +++---
1 file changed, 30
side the macros to affect both the
> structures.
>
> Reported-by: Jani Nikula
> Fixes: 56a709cf77468 ("drm/i915/gt: Create per-tile RPS sysfs interfaces")
> Signed-off-by: Andi Shyti
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 2
On Thu, 05 May 2022, Tvrtko Ursulin wrote:
> On 04/05/2022 19:37, Jani Nikula wrote:
>> Reduce the magic of what's going on in GEM_DEBUG_EXEC() by expanding it
>> inline and being explicit about it. It's as single use case anyway, so
>> the macro feels overkill.
>
On Mon, 09 May 2022, "Souza, Jose" wrote:
> On Mon, 2022-05-09 at 17:05 +0300, Jani Nikula wrote:
>> On Mon, 09 May 2022, Tvrtko Ursulin wrote:
>> > On 05/05/2022 20:35, José Roberto de Souza wrote:
>> > > No need to have this parameter in intel_de
odrigo)
>> v3: Retain previous function names to eliminate needless #defines (Rodrigo)
>>
>> Cc: Rodrigo Vivi
>> Cc: Jani Nikula
>> Cc: Andi Shyti
>> Signed-off-by: Ashutosh Dixit
>> ---
>> drivers/gpu/drm/i915/display/hsw_ips.c| 4 +-
>> > >\
>> > > .display.has_dsc = 1,
>> > >\
>> > > .display.fbc_mask = BIT(INTEL_FBC_A),
>> > >\
>> > > - .display.has_fpga_dbg = 1,
>> > >\
>> > > .display.has_hdcp = 1,
>> > >\
>> > > .display.has_hotplug = 1,
>> > >\
>> > > .display.ver = 13,
>> > >\
>> > > diff --git a/drivers/gpu/drm/i915/intel_device_info.h
>> > > b/drivers/gpu/drm/i915/intel_device_info.h
>> > > index 7581ef4a68f94..e61a334b611ac 100644
>> > > --- a/drivers/gpu/drm/i915/intel_device_info.h
>> > > +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> > > @@ -157,7 +157,6 @@ enum intel_ppgtt_type {
>> > > func(has_cdclk_crawl); \
>> > > func(has_dmc); \
>> > > func(has_dsc); \
>> > > - func(has_fpga_dbg); \
>> > > func(has_gmch); \
>> > > func(has_hdcp); \
>> > > func(has_hotplug); \
>> > > --
>> > > 2.36.0
>> > >
>>
--
Jani Nikula, Intel Open Source Graphics Center
t; .display.has_dp_mst = 1,
>> \
>> .display.has_dsb = 1,
>> \
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h
>> b/drivers/gpu/drm/i915/intel_device_info.h
>> index bef65e3f02c55..bc71ce48763ad 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> @@ -167,7 +167,6 @@ enum intel_ppgtt_type {
>> func(cursor_needs_physical); \
>> func(has_cdclk_crawl); \
>> func(has_dmc); \
>> -func(has_ddi); \
>> func(has_dp_mst); \
>> func(has_dsb); \
>> func(has_dsc); \
--
Jani Nikula, Intel Open Source Graphics Center
We'll need to propagate drm_edid everywhere. Also make version_greater()
a function for type safety.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 29 +
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers
We'll need to propagate drm_edid everywhere.
v2: Rebase
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_displayid.c | 16
drivers/gpu/drm/drm_edid.c | 17 ++---
include/drm/drm_displayid.h | 6 +++---
include/drm/drm_edid.h | 6 --
4
We'll need to propagate drm_edid everywhere.
v2: Handle NULL EDID pointer (Ville, CI)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index
We'll need to propagate drm_edid everywhere.
v2: Rebase
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bd14010ed1c5
We'll need to propagate drm_edid everywhere.
v2: Handle NULL drm_edid
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f072cfba9dd9
We'll need to propagate drm_edid everywhere.
v2: Handle NULL EDID pointer (Ville, CI)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 37 ++---
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu
We'll need to propagate drm_edid everywhere.
v2: Handle NULL EDID pointer (Ville, CI)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 33 -
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm
We'll need to propagate drm_edid everywhere.
v2: Fix checkpatch warning on superfluous parens
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b
We'll need to propagate drm_edid everywhere.'
v2: Handle NULL EDID pointer (Ville, CI)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 37 +++--
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu
We'll need to propagate drm_edid everywhere.
v2: Drop incorrect NULL name check (Dan Carpenter)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 24
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm
We'll need to propagate drm_edid everywhere.
v2: Handle NULL EDID pointer (Ville, CI)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 34 +-
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bea8f33c58ad..364949e146a9
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 52 --
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 51d918c66a26
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 037102a4d0b5..51d918c66a26 100644
--- a/drivers
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f54699422bca..c2887012add0
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5d8744a7b62e..037102a4d0b5 100644
--- a/drivers/gpu
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 8acdb08a8571..5d8744a7b62e 100644
--- a/drivers/gpu
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c2887012add0..8acdb08a8571 100644
--- a/drivers/gpu
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 95 ++
1 file changed, 46 insertions(+), 49 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index e4fdf742645b
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 96e3f9327044..e4fdf742645b 100644
We'll need to propagate drm_edid everywhere.
v2: Use drm_edid_legacy_init()
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 48 +++---
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm
, we'll have
EDID read return drm_edid objects.
v2: Add legacy init helper.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 30 +++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index
, we'll start converting the
guts of drm_edid.c to use it, and finally add interfaces around it.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dcef92c8887a
We have an iterator for this, use it. It does include the base block,
but its tag is 0 and will be skipped.
Signed-off-by: Jani Nikula
Reviewed-by: Ville Syrjälä
---
drivers/gpu/drm/drm_edid.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm
Only one of the conditions can be true.
Suggested-by: Ville Syrjälä
Signed-off-by: Jani Nikula
Reviewed-by: Ville Syrjälä
---
drivers/gpu/drm/drm_edid.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
v2 of [1] with some NULL deref bugs and checkpatch/sparse warnings
fixed.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/103665/
Jani Nikula (25):
drm/edid: use else-if in CTA extension parsing
drm/edid: convert drm_for_each_detailed_block() to edid iter
drm/edid: add struct
On Fri, 06 May 2022, Ville Syrjälä wrote:
> On Fri, May 06, 2022 at 01:10:24PM +0300, Jani Nikula wrote:
>> +int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads)
>> +{
>> +struct drm_edid drm_edid = {
>> +.edid = edid,
>> +
Fix:
drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c:61:6: warning: symbol
'intel_pxp_debugfs_register' was not declared. Should it be static?
Sort and remove the redundant pxp prefixes from the includes while at
it.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 5
t; #define POWER_DOMAIN_PIPE(pipe) ((pipe) + POWER_DOMAIN_PIPE_A)
> @@ -266,6 +269,15 @@ intel_display_power_put_all_in_set(struct
> drm_i915_private *i915,
>
> void intel_display_power_debug(struct drm_i915_private *i915, struct
> seq_file *m);
>
> +enum intel_display_power_domain
> +intel_display_power_ddi_lanes_domain(struct drm_i915_private *i915, enum
> port port);
> +enum intel_display_power_domain
> +intel_display_power_ddi_io_domain(struct drm_i915_private *i915, enum port
> port);
> +enum intel_display_power_domain
> +intel_display_power_legacy_aux_domain(struct drm_i915_private *i915, enum
> aux_ch aux_ch);
> +enum intel_display_power_domain
> +intel_display_power_tbt_aux_domain(struct drm_i915_private *i915, enum
> aux_ch aux_ch);
> +
> /*
> * FIXME: We should probably switch this to a 0-based scheme to be consistent
> * with how we now name/number DBUF_CTL instances.
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> b/drivers/gpu/drm/i915/display/intel_tc.c
> index fc037c027ea5a..b8b822ea37553 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -6,6 +6,7 @@
> #include "i915_drv.h"
> #include "i915_reg.h"
> #include "intel_display.h"
> +#include "intel_display_power_map.h"
> #include "intel_display_types.h"
> #include "intel_dp_mst.h"
> #include "intel_tc.h"
> @@ -61,10 +62,12 @@ bool intel_tc_cold_requires_aux_pw(struct
> intel_digital_port *dig_port)
> static enum intel_display_power_domain
> tc_cold_get_power_domain(struct intel_digital_port *dig_port, enum
> tc_port_mode mode)
> {
> + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> +
> if (mode == TC_PORT_TBT_ALT || !intel_tc_cold_requires_aux_pw(dig_port))
> return POWER_DOMAIN_TC_COLD_OFF;
>
> - return intel_legacy_aux_to_power_domain(dig_port->aux_ch);
> + return intel_display_power_legacy_aux_domain(i915, dig_port->aux_ch);
> }
>
> static intel_wakeref_t
--
Jani Nikula, Intel Open Source Graphics Center
_mhz' was not declared. Should it be static?
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c:474:8: warning: symbol
'dev_attr_rps_max_freq_mhz' was not declared. Should it be static?
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c:475:8: warning: symbol
'dev_attr_rps_min_freq_mhz' was not declared. Should i
Hey, do you ever run sparse on your driver? Whenever our CI ends up
recompiling amdgpu, there's quite the spew. See below.
You're not alone, but, sorry to say, the _Static_assert() from
amdgv_sriovmsg.h has been pretty obnoxious for quite some time now.
First, I don't think you should be using
wer well refactor patchset
drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses
drm/i915/dp: Add workaround for spurious AUX timeouts/hotplugs on LTTPR
links
Jani Nikula (8):
drm/i915/gvt: fix trace TRACE_INCLUDE_PATH
drm/i915/gvt: better align the Makefile with i
On Fri, 06 May 2022, Jani Nikula wrote:
> We'll need to propagate drm_edid everywhere.
I seem to have copy-pasted a TAB in some of the commit messages, in a
way that does not show up in git log.
>
> Signed-off-by: Jani Nikula
> ---
> drivers/gpu/drm/
We'll need to propagate drm_edid everywhere. Also make version_greater()
a function for type safety.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 29 +
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_displayid.c | 16
drivers/gpu/drm/drm_edid.c | 17 ++---
include/drm/drm_displayid.h | 6 +++---
include/drm/drm_edid.h | 6 --
4 files changed
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index b453bbf2f642..82db7afb4f8e 100644
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 82a242a71ecf..b453bbf2f642 100644
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 706552ae00ea..82a242a71ecf 100644
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 40 --
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 3277b4fd33ce
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 36 +++-
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 51aee048bcff
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 39 --
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 52ea187394dd
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 37 -
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 2017feecbe1c
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4fd2ee976d39
We'll need to propagate drm_edid everywhere.
v2: Drop incorrect NULL name check (Dan Carpenter)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 24
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4b2d3453fc5c..b8deced8de01
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 52 --
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 27655da6ef9c
We'll need to propagate drm_edid everywhere.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/drm_edid.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 3931c3318cf7..27655da6ef9c 100644
--- a/drivers
1 - 100 of 11418 matches
Mail list logo
