mbox series

[PULL] drm-intel-fixes

Message ID 8735olh27y.fsf@intel.com (mailing list archive)
State New, archived
Headers show
Series [PULL] drm-intel-fixes | expand

Pull-request

git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-10-28

Message

Jani Nikula Oct. 28, 2021, 10:29 a.m. UTC
Hi Dave & Daniel -

Certainly more than I'd like at this stage, but it's mostly Cc: stable
material, and the tracepoint change is a last minute revert to dodge a
potential "tracepoints are uabi" bullet before it hits the final
release.


BR,
Jani.


drm-intel-fixes-2021-10-28:
drm/i915 fixes for v5.15 final:
- Remove unconditional clflushes
- Fix oops on boot due to sync state on disabled DP encoders
- Revert backend specific data added to tracepoints
- Remove useless and incorrect memory frequence calculation

BR,
Jani.

The following changes since commit 519d81956ee277b4419c723adfb154603c2565ba:

  Linux 5.15-rc6 (2021-10-17 20:00:13 -1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-10-28

for you to fetch changes up to 9a4aa3a2f1606a03c220b21049baa4a2b6169626:

  drm/i915: Revert 'guc_id' from i915_request tracepoint (2021-10-28 11:45:11 +0300)

----------------------------------------------------------------
drm/i915 fixes for v5.15 final:
- Remove unconditional clflushes
- Fix oops on boot due to sync state on disabled DP encoders
- Revert backend specific data added to tracepoints
- Remove useless and incorrect memory frequence calculation

----------------------------------------------------------------
Imre Deak (1):
      drm/i915/dp: Skip the HW readout of DPCD on disabled encoders

Joonas Lahtinen (1):
      drm/i915: Revert 'guc_id' from i915_request tracepoint

José Roberto de Souza (1):
      drm/i915: Remove memory frequency calculation

Ville Syrjälä (2):
      drm/i915: Convert unconditional clflush to drm_clflush_virt_range()
      drm/i915: Catch yet another unconditioal clflush

 drivers/gpu/drm/i915/display/intel_dp.c  |  3 +++
 drivers/gpu/drm/i915/gt/intel_timeline.c |  4 ++--
 drivers/gpu/drm/i915/i915_reg.h          |  8 --------
 drivers/gpu/drm/i915/i915_trace.h        |  7 ++-----
 drivers/gpu/drm/i915/intel_dram.c        | 30 ++----------------------------
 5 files changed, 9 insertions(+), 43 deletions(-)

Comments

Ville Syrjälä Oct. 28, 2021, 1:20 p.m. UTC | #1
On Thu, Oct 28, 2021 at 01:29:21PM +0300, Jani Nikula wrote:
> 
> Hi Dave & Daniel -
> 
> Certainly more than I'd like at this stage, but it's mostly Cc: stable
> material, and the tracepoint change is a last minute revert to dodge a
> potential "tracepoints are uabi" bullet before it hits the final
> release.
> 
> 
> BR,
> Jani.
> 
> 
> drm-intel-fixes-2021-10-28:
> drm/i915 fixes for v5.15 final:
> - Remove unconditional clflushes
> - Fix oops on boot due to sync state on disabled DP encoders
> - Revert backend specific data added to tracepoints
> - Remove useless and incorrect memory frequence calculation
> 
> BR,
> Jani.
> 
> The following changes since commit 519d81956ee277b4419c723adfb154603c2565ba:
> 
>   Linux 5.15-rc6 (2021-10-17 20:00:13 -1000)
> 
> are available in the Git repository at:
> 
>   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-10-28
> 
> for you to fetch changes up to 9a4aa3a2f1606a03c220b21049baa4a2b6169626:
> 
>   drm/i915: Revert 'guc_id' from i915_request tracepoint (2021-10-28 11:45:11 +0300)
> 
> ----------------------------------------------------------------
> drm/i915 fixes for v5.15 final:
> - Remove unconditional clflushes
> - Fix oops on boot due to sync state on disabled DP encoders
> - Revert backend specific data added to tracepoints
> - Remove useless and incorrect memory frequence calculation
> 
> ----------------------------------------------------------------
> Imre Deak (1):
>       drm/i915/dp: Skip the HW readout of DPCD on disabled encoders
> 
> Joonas Lahtinen (1):
>       drm/i915: Revert 'guc_id' from i915_request tracepoint
> 
> José Roberto de Souza (1):
>       drm/i915: Remove memory frequency calculation
> 
> Ville Syrjälä (2):
>       drm/i915: Convert unconditional clflush to drm_clflush_virt_range()
>       drm/i915: Catch yet another unconditioal clflush

Where did the third one go?
commit ef7ec41f17cb ("drm/i915: Replace the unconditional clflush with drm_clflush_virt_range()")

> 
>  drivers/gpu/drm/i915/display/intel_dp.c  |  3 +++
>  drivers/gpu/drm/i915/gt/intel_timeline.c |  4 ++--
>  drivers/gpu/drm/i915/i915_reg.h          |  8 --------
>  drivers/gpu/drm/i915/i915_trace.h        |  7 ++-----
>  drivers/gpu/drm/i915/intel_dram.c        | 30 ++----------------------------
>  5 files changed, 9 insertions(+), 43 deletions(-)
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center
Jani Nikula Oct. 28, 2021, 2:33 p.m. UTC | #2
On Thu, 28 Oct 2021, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Oct 28, 2021 at 01:29:21PM +0300, Jani Nikula wrote:
>> 
>> Hi Dave & Daniel -
>> 
>> Certainly more than I'd like at this stage, but it's mostly Cc: stable
>> material, and the tracepoint change is a last minute revert to dodge a
>> potential "tracepoints are uabi" bullet before it hits the final
>> release.
>> 
>> 
>> BR,
>> Jani.
>> 
>> 
>> drm-intel-fixes-2021-10-28:
>> drm/i915 fixes for v5.15 final:
>> - Remove unconditional clflushes
>> - Fix oops on boot due to sync state on disabled DP encoders
>> - Revert backend specific data added to tracepoints
>> - Remove useless and incorrect memory frequence calculation
>> 
>> BR,
>> Jani.
>> 
>> The following changes since commit 519d81956ee277b4419c723adfb154603c2565ba:
>> 
>>   Linux 5.15-rc6 (2021-10-17 20:00:13 -1000)
>> 
>> are available in the Git repository at:
>> 
>>   git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-10-28
>> 
>> for you to fetch changes up to 9a4aa3a2f1606a03c220b21049baa4a2b6169626:
>> 
>>   drm/i915: Revert 'guc_id' from i915_request tracepoint (2021-10-28 11:45:11 +0300)
>> 
>> ----------------------------------------------------------------
>> drm/i915 fixes for v5.15 final:
>> - Remove unconditional clflushes
>> - Fix oops on boot due to sync state on disabled DP encoders
>> - Revert backend specific data added to tracepoints
>> - Remove useless and incorrect memory frequence calculation
>> 
>> ----------------------------------------------------------------
>> Imre Deak (1):
>>       drm/i915/dp: Skip the HW readout of DPCD on disabled encoders
>> 
>> Joonas Lahtinen (1):
>>       drm/i915: Revert 'guc_id' from i915_request tracepoint
>> 
>> José Roberto de Souza (1):
>>       drm/i915: Remove memory frequency calculation
>> 
>> Ville Syrjälä (2):
>>       drm/i915: Convert unconditional clflush to drm_clflush_virt_range()
>>       drm/i915: Catch yet another unconditioal clflush
>
> Where did the third one go?
> commit ef7ec41f17cb ("drm/i915: Replace the unconditional clflush with drm_clflush_virt_range()")

It failed to cherry-pick cleanly, and I failed to ask for a
backport. Too late now, will need to go via -next-fixes or v5.16-rc1 and
backports to stable.

BR,
Jani.


>
>> 
>>  drivers/gpu/drm/i915/display/intel_dp.c  |  3 +++
>>  drivers/gpu/drm/i915/gt/intel_timeline.c |  4 ++--
>>  drivers/gpu/drm/i915/i915_reg.h          |  8 --------
>>  drivers/gpu/drm/i915/i915_trace.h        |  7 ++-----
>>  drivers/gpu/drm/i915/intel_dram.c        | 30 ++----------------------------
>>  5 files changed, 9 insertions(+), 43 deletions(-)
>> 
>> -- 
>> Jani Nikula, Intel Open Source Graphics Center