28 Mar, 2009
28 commits
-
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.cManual merge to resolve build warning due to phys_addr_t type change
on x86:drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar
-
For the fifteen bazillionth time.
See also commits f06da264cfb0f9444d41ca247213e419f90aa72a and
aeb565dfc3ac4c8b47c5049085b4c7bfb2c7d5d7 ("i915: Fix more size_t format
string warnings" and "Fix annoying DRM_ERROR() string warning").Grr-target: Eric Anholt
Grr-target: Chris Wilson
Signed-off-by: Linus Torvalds -
Update bdb_lvds_options structure according to its defination in
2D driver. Then we can parse and set 'lvds_dither' bit correctly
on non-965 chips.Signed-off-by: Li Peng
Signed-off-by: Eric Anholt -
I've hit the occasional oops inside i915_wait_ring() with an indication of
a NULL derefence of dev->primary->master. Adding a NULL check is
consistent with the other potential users of dev->primary->master.Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt -
Check that the encoder has a real enabled crtc for TV detect, and fix
missing TV type setting after detect.Signed-off-by: Zhenyu Wang
Signed-off-by: Eric Anholt -
Fix TV control save register for untouched bits, and color
knobs different definition for 945 and 965 chips.Signed-off-by: Zhenyu Wang
Signed-off-by: Eric Anholt -
The get_modes hook must return the number of modes added. This also fixes
TV mode's clock calculation int overflow issue, and use 0.01 precision for
mode refresh validation.Signed-off-by: Zhenyu Wang
Signed-off-by: Eric Anholt -
This covers:
Use long crt hotplug activation time on GM45.Signed-off-by: Zhao Yakui
Signed-off-by: Eric Anholt -
This covers:
Limit CRT DAC speed better.and also clears the border color in case it's set to some garbage, which would
fix ugly outlines in the blank regions of the CRT.Signed-off-by: Zhao Yakui
[anholt: replaced *drm_dev with *dev]
Signed-off-by: Eric Anholt -
This covers at least:
TV: subcarrier fix for NTSC and PAL
TV: fix timing parameters for PAL, 480p, 1080iSigned-off-by: Zhenyu Wang
Signed-off-by: Eric Anholt -
This is a G33-like desktop and mobile chipset.
Signed-off-by: Shaohua Li
Signed-off-by: Eric Anholt -
agp_chipset_flush() is for flushing the intel GMCH write cache via the
IFP, these two uses are for when we're getting the object into the cpu
READ domain, and thus should not be needed. This confused me when I was
getting my head around the code.With thanks to airlied for helping me check my mental picture of how the
flushes and clflushes are supposed to be used.Signed-off-by: Owain G. Ainsworth
Signed-off-by: Eric Anholt -
Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt -
This was inspired by a patch by Chris Wilson, though none of it applied in any
way due to the debugfs work and I decided to change the formatting of the
new information anyway.Signed-off-by: Eric Anholt
-
Here we eliminate a few functions in favor of using a single function
to dump from all of the object lists.Signed-Off-By: Ben Gamari
Signed-off-by: Eric Anholt -
Signed-off-by: Ben Gamari
Signed-off-by: Eric Anholt -
The old mechanism to formatting proc files is extremely ugly. The
seq_file API was designed specifically for cases like this and greatly
simplifies the process.Also, most of the files in /proc really don't belong there. This patch
introduces the infrastructure for putting these into debugfs and exposes
all of the proc files in debugfs as well.Signed-off-by: Ben Gamari
Signed-off-by: Eric Anholt -
Signed-off-by: Eric Anholt
Reviewed-by: Keith Packard -
This introduces allocation in the batch submission path that wasn't there
previously, but these are compatibility paths so we care about simplicity
more than performance.kernel.org bug #12419.
Signed-off-by: Eric Anholt
Reviewed-by: Keith Packard
Acked-by: Jesse Barnes -
Signed-off-by: Eric Anholt
Reviewed-by: Jesse Barnes -
Like the GTT pwrite path fix, this uses an optimistic path and a
fallback to get_user_pages. Note that this means we have to stop using
vfs_write and roll it ourselves.Signed-off-by: Eric Anholt
Reviewed-by: Jesse Barnes -
We've wanted this for a few consumers that touch the pages directly (such as
the following commit), which have been doing the refcounting outside of
get/put pages.Signed-off-by: Eric Anholt
Reviewed-by: Jesse Barnes -
Since the pagefault path determines that the lock order we use has to be
mmap_sem -> struct_mutex, we can't allow page faults to occur while the
struct_mutex is held. To fix this in pwrite, we first try optimistically to
see if we can copy from user without faulting. If it fails, fall back to
using get_user_pages to pin the user's memory, and map those pages
atomically when copying it to the GPU.Signed-off-by: Eric Anholt
Reviewed-by: Jesse Barnes -
This fixes incorrect detection of the second SDVO/HDMI output on G4X, and
extra boot time on pre-G4X.Signed-off-by: Kristian Høgsberg
Signed-off-by: Eric Anholt -
This improves the PLL timings according to the suggestion of the hardware
engineers. This results in some outputs being able to sync that weren't
able to before.This is part of fixing fd.o bug #17508.
Signed-off-by: Ma Ling
[anholt: cleaned up a couple of redundant comments]
Signed-off-by: Eric Anholt -
The values come from the internal reference spreadsheet on PLL
timing limits for the G4X chipsets.Part of fixing fd.o bug #17508
Signed-off-by: Ma Ling
[anholt: Cleaned up some whitespace]
Signed-off-by: Eric Anholt -
Later spec investigation has revealed that every 9xx mobile part has
had this register in this format. Also, no non-mobile parts have been shown
to have this register. So make all mobile use the same code, and all
non-mobile use the hack 965 detection.Signed-off-by: Eric Anholt
-
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.cSemantic merge:
arch/x86/include/asm/fixmap.hSigned-off-by: Ingo Molnar
27 Mar, 2009
1 commit
-
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
Rationalize fasync return values
Move FASYNC bit handling to f_op->fasync()
Use f_lock to protect f_flags
Rename struct file->f_ep_lock
25 Mar, 2009
1 commit
-
Cc: airlied@linux.ie
Acked-by: Greg Kroah-Hartman
Signed-off-by: Kay Sievers
16 Mar, 2009
1 commit
-
Most fasync implementations do something like:
return fasync_helper(...);
But fasync_helper() will return a positive value at times - a feature used
in at least one place. Thus, a number of other drivers do:err = fasync_helper(...);
if (err < 0)
return err;
return 0;In the interests of consistency and more concise code, it makes sense to
map positive return values onto zero where ->fasync() is called.Cc: Al Viro
Signed-off-by: Jonathan Corbet
12 Mar, 2009
2 commits
-
The last 8 fence registers sit at a different offset, so when we went to set
fence number 8 in the lower offset, we instead set PGETBL_CTL, and the GPU
got all sorts of angry at us.fd.o bug #20567. Easily reproducible by running glxgears and killing it about
6 times.Signed-off-by: Eric Anholt
-
The i915 also uses the fence registers for GPU access to tiled buffers so
we cannot reallocate one whilst it is on the active list. By performing a
LRU scan of the fenced buffers we also avoid waiting the possibility of
waiting on a pinned, or otherwise unusable, buffer.Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt
11 Mar, 2009
7 commits
-
We need to check and report if there are no available fences - or else we
spin endlessly waiting for a buffer to magically unpin itself.Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt -
As we may steal the fence register of an unpinned buffer for another,
every time we repin the buffer we need to recheck whether it needs to be
allocated a fence.Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt -
If we wait upon a request and successfully unbind a buffer occupying a
fence register, then that slot will be freed and cause a NULL derefrence
upon rescanning.Signed-off-by: Chris Wilson
Signed-off-by: Eric Anholt -
Signed-off-by: Eric Anholt
-
The VGA registers just hit the pipe registers that we already set through
MMIO. This fixes strange colors on resume.Signed-off-by: Pierre Willenbrock
Signed-off-by: Eric Anholt -
Prevents formatting nasty as below:
[drm:i915_gem_object_pin] *ERROR* Failure to bind: -12[drm:i915_gem_evict_something] *ERROR* inactive empty 1 request empty 1 flushing empty 1
Signed-off-by: Kyle McMartin
Signed-off-by: Eric Anholt -
If userspace passes an object list with the same object appearing more
than once, we end up hitting the BUG_ON() in
i915_gem_object_set_to_gpu_domain() as it gets called a second time
for the same object.Signed-off-by: Kristian Høgsberg
Signed-off-by: Eric Anholt
