2015-06-06 06:58:27

by Dave Airlie

[permalink] [raw]
Subject: [drm fixes] git pull


Hi Linus,

i915 has a bunch of fixes, and Russell found a bug in sysfs writing
handling that results in userspace getting stuck.

Dave.

The following changes since commit 456fdb267377b88fa37abf60fcbd9bfaa813bf1f:

Merge tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (2015-06-05 10:22:06 -0700)

are available in the git repository at:


git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 38d8571dad8a759bdc051dbff747b189c90658cf:

drm: fix writing to /sys/class/drm/*/status (2015-06-06 08:27:30 +1000)

----------------------------------------------------------------
Ander Conselvan de Oliveira (1):
drm/i915: Include G4X/VLV/CHV in self refresh status

Arun Siluvery (1):
drm/i915: Initialize HWS page address after GPU reset

Dave Airlie (1):
Merge tag 'drm-intel-fixes-2015-06-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Jim Bride (1):
drm/i915/hsw: Fix workaround for server AUX channel clock divisor

Russell King (1):
drm: fix writing to /sys/class/drm/*/status

Ville Syrj?l? (2):
drm/i915: Don't skip request retirement if the active list is empty
drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code

drivers/gpu/drm/drm_sysfs.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 5 ++++-
drivers/gpu/drm/i915/i915_gem.c | 3 ---
drivers/gpu/drm/i915/intel_dp.c | 5 ++---
drivers/gpu/drm/i915/intel_lrc.c | 6 ++++++
drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
6 files changed, 20 insertions(+), 15 deletions(-)


2015-06-06 16:21:02

by Linus Torvalds

[permalink] [raw]
Subject: Re: [drm fixes] git pull

On Fri, Jun 5, 2015 at 11:58 PM, Dave Airlie <[email protected]> wrote:
>
> i915 has a bunch of fixes [..]

.. but nof ix for the regression that Stefan Lippers-Hollmann
reported? An oops in intel_modeset_update_connector_atomic_state() due
to commit 08d9bc920d46 ("drm/i915: Allocate connector state together
with the connectors")?

I hope people are looking at that..

Linus

2015-06-08 10:55:38

by Jani Nikula

[permalink] [raw]
Subject: Re: [drm fixes] git pull

On Sat, 06 Jun 2015, Linus Torvalds <[email protected]> wrote:
> On Fri, Jun 5, 2015 at 11:58 PM, Dave Airlie <[email protected]> wrote:
>>
>> i915 has a bunch of fixes [..]
>
> .. but nof ix for the regression that Stefan Lippers-Hollmann
> reported? An oops in intel_modeset_update_connector_atomic_state() due
> to commit 08d9bc920d46 ("drm/i915: Allocate connector state together
> with the connectors")?
>
> I hope people are looking at that..

Ander fixed this, will be included in this week's fixes pull.

BR,
Jani.


--
Jani Nikula, Intel Open Source Technology Center