[git pull] drm fixes for -rc1

[git pull] drm fixes for -rc1

[Dave Airlie]

Hi Linus,

this replaces the pull I sent yesterday that I don't see in your tree yet.

It should have the fix for your i915 in the intel patches, along with
a couple of radeon fixes, and the vblank change + fix.

Dave.

The following changes since commit c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d:

  drm/radeon: fixup refcounts in radeon dumb create ioctl. (2011-03-17 13:58:34 +1000)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-core-next

Alex Deucher (2):
      drm/radeon/kms: prefer legacy pll algo for tv-out
      drm/radeon/kms: fix hardcoded EDID handling

Chris Wilson (10):
      drm: Fix use-after-free in drm_gem_vm_close()
      drm/i915: Remove surplus POSTING_READs before wait_for_vblank
      drm/i915: skip redundant operations whilst enabling pipes and planes
      drm/i915: Fix tiling corruption from pipelined fencing
      drm/i915: Fix computation of pitch for dumb bo creator
      drm/i915: Disable pagefaults along execbuffer relocation fast path
      drm/i915: Restore missing command flush before interrupt on BLT ring
      drm/i915: Fix use after free within tracepoint
      drm/i915: Avoid unmapping pages from a NULL address space
      Revert "drm/i915: Don't save/restore hardware status page address register"

Dave Airlie (3):
      drm: check for modesetting on modeset ioctls
      Merge remote branch 'intel/drm-intel-fixes' of ../drm-next into drm-core-next
      drm/vblank: update recently added vbl interface to be more future proof.

Herton Ronaldo Krzesinski (1):
      drm/i915: Prevent racy removal of request from client list

Ilija Hadzic (1):
      drm/kernel: vblank wait on crtc > 1

Jesse Barnes (1):
      drm/i915: report correct render clock frequencies on SNB

Takashi Iwai (1):
      drm/i915/dp: Correct the order of deletion for ghost eDP devices

Thomas Renninger (1):
      drm radeon: Return -EINVAL on wrong pm sysfs access

Yuanhan Liu (1):
      drm/i915: Re-enable self-refresh

 drivers/gpu/drm/drm_crtc.c                 |   51 +++++++++++++
 drivers/gpu/drm/drm_gem.c                  |    5 +-
 drivers/gpu/drm/drm_ioctl.c                |    3 +
 drivers/gpu/drm/drm_irq.c                  |   15 +++--
 drivers/gpu/drm/i915/i915_debugfs.c        |    8 +-
 drivers/gpu/drm/i915/i915_drv.h            |    1 +
 drivers/gpu/drm/i915/i915_gem.c            |   70 +++++++++---------
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   21 +++++-
 drivers/gpu/drm/i915/i915_suspend.c        |    6 ++
 drivers/gpu/drm/i915/intel_display.c       |   39 +++++------
 drivers/gpu/drm/i915/intel_dp.c            |    4 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c    |  109 +++++++++++++---------------
 drivers/gpu/drm/radeon/atombios_crtc.c     |    6 ++-
 drivers/gpu/drm/radeon/radeon_combios.c    |   21 ++++--
 drivers/gpu/drm/radeon/radeon_connectors.c |   30 +++++++-
 drivers/gpu/drm/radeon/radeon_mode.h       |    1 +
 drivers/gpu/drm/radeon/radeon_pm.c         |    8 ++-
 include/drm/drm.h                          |    4 +
 18 files changed, 257 insertions(+), 145 deletions(-)

Re: [git pull] drm fixes for -rc1

[Pekka Enberg]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

On Thu, Mar 24, 2011 at 1:34 PM, Dave Airlie <airlied@linux.ie> wrote:
> It should have the fix for your i915 in the intel patches, along with
> a couple of radeon fixes, and the vblank change + fix.

I'm seeing some laptop screen flicker during boot and a while after I
log in (it then seems to go away). It's my trusty old Macbook with
i915 and Ubuntu 10.04. I see this in dmesg:

[    1.782046] [drm] initialized overlay support
[    1.782075] [drm] capturing error event; look for more information
in /debug/dri/0/i915_error_state
[    1.782889] render error detected, EIR: 0x00000010
[    1.782933] page table error
[    1.782970]   PGTBL_ER: 0x00000102
[    1.783009] [drm:i915_report_and_clear_eir] *ERROR* EIR stuck:
0x00000010, masking
[    1.783063] render error detected, EIR: 0x00000010
[    1.783106] page table error
[    1.783143]   PGTBL_ER: 0x00000102

I'm attaching the full dmesg, i915_error_state, and .config.

                         Pekka

[-- Attachment #2: i915_error_state.gz --]
[-- Type: application/x-gzip, Size: 92190 bytes --]

[-- Attachment #3: config.gz --]
[-- Type: application/x-gzip, Size: 20257 bytes --]

[-- Attachment #4: dmesg.gz --]
[-- Type: application/x-gzip, Size: 13976 bytes --]

Re: [git pull] drm fixes for -rc1

[Pekka Enberg]

On Mon, Mar 28, 2011 at 9:43 PM, Pekka Enberg <penberg@kernel.org> wrote:
> On Thu, Mar 24, 2011 at 1:34 PM, Dave Airlie <airlied@linux.ie> wrote:
>> It should have the fix for your i915 in the intel patches, along with
>> a couple of radeon fixes, and the vblank change + fix.
>
> I'm seeing some laptop screen flicker during boot and a while after I
> log in (it then seems to go away). It's my trusty old Macbook with
> i915 and Ubuntu 10.04. I see this in dmesg:
>
> [    1.782046] [drm] initialized overlay support
> [    1.782075] [drm] capturing error event; look for more information
> in /debug/dri/0/i915_error_state
> [    1.782889] render error detected, EIR: 0x00000010
> [    1.782933] page table error
> [    1.782970]   PGTBL_ER: 0x00000102
> [    1.783009] [drm:i915_report_and_clear_eir] *ERROR* EIR stuck:
> 0x00000010, masking
> [    1.783063] render error detected, EIR: 0x00000010
> [    1.783106] page table error
> [    1.783143]   PGTBL_ER: 0x00000102
>
> I'm attaching the full dmesg, i915_error_state, and .config.

I'm also seeing these errors now which seem to be new from 2.6.38-final:

[  437.566022] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
purgeable buffer
[  437.566187] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
purgeable buffer
[  437.566232] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
purgeable buffer
[  437.566275] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
purgeable buffer
[  437.566318] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
purgeable buffer

Re: [git pull] drm fixes for -rc1

[Chris Wilson]

On Mon, 28 Mar 2011 21:53:32 +0300, Pekka Enberg <penberg@kernel.org> wrote:
> On Mon, Mar 28, 2011 at 9:43 PM, Pekka Enberg <penberg@kernel.org> wrote:
> > On Thu, Mar 24, 2011 at 1:34 PM, Dave Airlie <airlied@linux.ie> wrote:
> >> It should have the fix for your i915 in the intel patches, along with
> >> a couple of radeon fixes, and the vblank change + fix.
> >
> > I'm seeing some laptop screen flicker during boot and a while after I
> > log in (it then seems to go away). It's my trusty old Macbook with
> > i915 and Ubuntu 10.04. I see this in dmesg:
> >
> > [    1.782046] [drm] initialized overlay support
> > [    1.782075] [drm] capturing error event; look for more information
> > in /debug/dri/0/i915_error_state
> > [    1.782889] render error detected, EIR: 0x00000010
> > [    1.782933] page table error
> > [    1.782970]   PGTBL_ER: 0x00000102
> > [    1.783009] [drm:i915_report_and_clear_eir] *ERROR* EIR stuck:
> > 0x00000010, masking
> > [    1.783063] render error detected, EIR: 0x00000010
> > [    1.783106] page table error
> > [    1.783143]   PGTBL_ER: 0x00000102
> >
> > I'm attaching the full dmesg, i915_error_state, and .config.

Right, looks like we have an issue with setting up the hardware for
KMS/GEM whilst it is still active. As we disable the outputs anyway for
the KMS takeover, we can arrange to do so first and so prevent this bug.
The side-effect will be that initial screen blanking will last a little
bit longer.

> I'm also seeing these errors now which seem to be new from 2.6.38-final:
> 
> [  437.566022] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
> purgeable buffer
> [  437.566187] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
> purgeable buffer
> [  437.566232] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
> purgeable buffer
> [  437.566275] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
> purgeable buffer
> [  437.566318] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
> purgeable buffer

That's an old userspace bug, which so far no one has been able to
reproduce on the upstream ddx.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [git pull] drm fixes for -rc1

[Pekka Enberg]

On Mon, Mar 28, 2011 at 10:09 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Mon, 28 Mar 2011 21:53:32 +0300, Pekka Enberg <penberg@kernel.org> wrote:
>> On Mon, Mar 28, 2011 at 9:43 PM, Pekka Enberg <penberg@kernel.org> wrote:
>> > On Thu, Mar 24, 2011 at 1:34 PM, Dave Airlie <airlied@linux.ie> wrote:
>> >> It should have the fix for your i915 in the intel patches, along with
>> >> a couple of radeon fixes, and the vblank change + fix.
>> >
>> > I'm seeing some laptop screen flicker during boot and a while after I
>> > log in (it then seems to go away). It's my trusty old Macbook with
>> > i915 and Ubuntu 10.04. I see this in dmesg:
>> >
>> > [    1.782046] [drm] initialized overlay support
>> > [    1.782075] [drm] capturing error event; look for more information
>> > in /debug/dri/0/i915_error_state
>> > [    1.782889] render error detected, EIR: 0x00000010
>> > [    1.782933] page table error
>> > [    1.782970]   PGTBL_ER: 0x00000102
>> > [    1.783009] [drm:i915_report_and_clear_eir] *ERROR* EIR stuck:
>> > 0x00000010, masking
>> > [    1.783063] render error detected, EIR: 0x00000010
>> > [    1.783106] page table error
>> > [    1.783143]   PGTBL_ER: 0x00000102
>> >
>> > I'm attaching the full dmesg, i915_error_state, and .config.
>
> Right, looks like we have an issue with setting up the hardware for
> KMS/GEM whilst it is still active. As we disable the outputs anyway for
> the KMS takeover, we can arrange to do so first and so prevent this bug.
> The side-effect will be that initial screen blanking will last a little
> bit longer.

Let me know if there's a patch/git tree to test. The flicker is
extremely annoying and I boot the machine often because it's my main
kernel development laptop.

>> I'm also seeing these errors now which seem to be new from 2.6.38-final:
>>
>> [  437.566022] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
>> purgeable buffer
>> [  437.566187] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
>> purgeable buffer
>> [  437.566232] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
>> purgeable buffer
>> [  437.566275] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
>> purgeable buffer
>> [  437.566318] [drm:i915_gem_mmap_gtt] *ERROR* Attempting to mmap a
>> purgeable buffer
>
> That's an old userspace bug, which so far no one has been able to
> reproduce on the upstream ddx.

Is it harmless? Why is the kernel complaining about it?

Re: [git pull] drm fixes for -rc1

[Chris Wilson]

On Tue, 29 Mar 2011 10:11:21 +0300, Pekka Enberg <penberg@kernel.org> wrote:
> On Mon, Mar 28, 2011 at 10:09 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Let me know if there's a patch/git tree to test. The flicker is
> extremely annoying and I boot the machine often because it's my main
> kernel development laptop.

I will let you know as soon as I have something ready for testing.
 
> > That's an old userspace bug, which so far no one has been able to
> > reproduce on the upstream ddx.
> 
> Is it harmless? Why is the kernel complaining about it?

Being pragmatic, so that I can tell one EINVAL apart from another. And
it's only mostly harmless. Userspace is attempting to write to/read from
a buffer it has marked as being no longer required, so some rendering is
going amiss. And it does not rule out the possibility that at some point
it will catch the error later and result in a SIGBUS being sent to the
application (probably X).

However since it is not a kernel error nor is it fatal, that and a lot of
similar messages can be demoted to debug.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre