Commit Graph

10426 Commits

Author SHA1 Message Date
Simon
4b61629e02 rockchip: gpu: add /sys/rk_gpu/error_count
Note: these add node "error_count" for rk3036/rk312x/rk3288
	  gpu error auto detect,if cat /sys/rk_gpu/error_count return
	  > 1,means gpu work unnormal currently
2014-10-09 10:02:43 +08:00
Simon
f2e30b1ad4 rk312x: gpu: disable the highest freq except benchmark,version to 0x03 2014-09-29 09:47:45 +08:00
CMY
b3d8ca9bcc rk: gpu: print more debug info for Android's memtrack 2014-08-29 15:20:08 +08:00
simon
08e5708b72 rockchip: gpu: update version of midgard to 0x0b && mali400 to 0x02 to mark iommu enabled 2014-08-22 17:00:59 +08:00
simon
b7fd49347d rockchip: mali400: update to R4P1-01REL0 2014-08-19 09:44:46 +08:00
simon
5ba080bc66 rockchip: midgard: version to 0x0a 2014-08-15 10:59:57 +08:00
simon
7849e2a21e rockchip: midgard: renable temperature control in dvfs 2014-08-15 10:59:57 +08:00
simon
643d90b064 rockchip: midgard: cancel dvfs timers when recieve reboot notifier event 2014-08-15 10:35:22 +08:00
黄涛
c7412991e9 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile
2014-08-08 10:21:50 +08:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
黄涛
4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
2014-08-04 16:52:07 +08:00
xxm
1dc06ea101 rockchip:mali400:fix gpu clk name:clk_gpu 2014-08-01 14:26:10 +08:00
xxm
11d06ca448 rockchip:mali400:enable gpu pd 2014-08-01 11:32:38 +08:00
xxm
6a805bcf2b rockchip:midgard:1,update gpu version to r4p1-00rel0 2,add input handler when runtime on/off 3,version to 0x09 2014-07-29 14:19:17 +08:00
黄涛
b5d61451d6 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next 2014-07-28 16:09:07 +08:00
xxm
50fe670e0b rockchip:mali400:ump no longer exist,so define map_errcode in mali.ko permanent 2014-07-28 14:25:10 +08:00
xxm
255f9f335a rockchip:mali400:fix audis clock init with name clk_gpu_pre ,tmp disable audi mali pd 2014-07-24 15:47:44 +08:00
xxm
5c692f10e1 rockchip:mali400:init mali clock for audis ,init mali clock and pd for audi 2014-07-24 11:23:21 +08:00
xxm
e8c6610a9b rockchip:mali400:fix compile error about function map_error 2014-07-22 18:18:57 +08:00
xxm
aadb67e5e3 rockchip:mali400:revert function:mali_mem_validation_add_range,don't use rk_get_fb 2014-07-21 18:51:44 +08:00
xxm
bac65c4e71 rockchip:midgard:1,keep gpu clock when runtime resume 2,version to 0x07 2014-07-21 15:07:36 +08:00
xxm
d62934e924 rockchip:midgard:
1.use list_for_each_safe instead of list_for_each ,_list_del may happend in
  interrupt,may cause the unsync operation

2.add msleep(500) in the entry of kbase_release to postpone the operation when app quit

3.version to 0x06
2014-07-21 09:08:15 +08:00
Christian König
5f4b3e2d0a drm/radeon: stop poisoning the GART TLB
commit 0986c1a55c upstream.

When we set the valid bit on invalid GART entries they are
loaded into the TLB when an adjacent entry is loaded. This
poisons the TLB with invalid entries which are sometimes
not correctly removed on TLB flush.

For stable inclusion the patch probably needs to be modified a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-17 15:58:03 -07:00
Alex Deucher
e9c2b01dc3 drm/radeon: fix typo in golden register setup on evergreen
commit 6abafb78f9 upstream.

Fixes hangs on driver load on some cards.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=76998

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-17 15:58:03 -07:00
黄涛
c1d0a2d670 Revert "rockchip:mali400:tmp not disable mali clk ,enable mali runtime pm"
This reverts commit 8c503dc354.
2014-07-15 17:05:33 +08:00
xxm
8c503dc354 rockchip:mali400:tmp not disable mali clk ,enable mali runtime pm 2014-07-15 15:02:15 +08:00
黄涛
bacd1f5e35 mali400: fix rk3036 init
rk3036 don't support power manager
2014-07-12 15:32:34 +08:00
黄涛
18ec4c746a mali400: mali_osk_mali: fix get irq with dts 2014-07-12 15:17:32 +08:00
黄涛
77ddfc9d50 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/usb/dwc_otg_310/usbdev_rk.h
2014-07-10 09:22:27 +08:00
Thomas Hellstrom
f0d88b9b44 drm/vmwgfx: Fix incorrect write to read-only register v2:
commit 4e578080ed upstream.

Commit "drm/vmwgfx: correct fb_fix_screeninfo.line_length", while fixing a
vmwgfx fbdev bug, also writes the pitch to a supposedly read-only register:
SVGA_REG_BYTES_PER_LINE, while it should be (and also in fact is) written to
SVGA_REG_PITCHLOCK.

This patch is Cc'd stable because of the unknown effects writing to this
register might have, particularly on older device versions.

v2: Updated log message.

Cc: Christopher Friedt <chrisfriedt@gmail.com>
Tested-by: Christopher Friedt <chrisfriedt@gmail.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
Marek Olšák
9ca04cfc66 drm/radeon: don't allow RADEON_GEM_DOMAIN_CPU for command submission
commit ec65da385d upstream.

It hangs the hardware.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
Alex Deucher
0838b8d017 drm/radeon/atom: fix dithering on certain panels
commit 642528355c upstream.

We need to specify the encoder mode as LVDS for eDP
when using the Crtc_Source atom table in order to properly
set up the FMT hardware.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=73911

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
Alex Deucher
c7fefec655 drm/radeon/dp: fix lane/clock setup for dp 1.2 capable devices
commit 3b6d9fd23e upstream.

Only DCE5+ asics support DP 1.2.

Noticed by ArtForz on IRC.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
Alex Deucher
e3eda5c59e drm/radeon: fix typo in radeon_connector_is_dp12_capable()
commit af5d36539d upstream.

We were checking the ext clock rather than the display clock.

Noticed by ArtForz on IRC.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
Alex Deucher
59dbea87be drm/radeon: only apply hdmi bpc pll flags when encoder mode is hdmi
commit 7d5ab3009a upstream.

May fix display issues with non-HDMI displays.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-09 11:14:00 -07:00
xxm
a972d04f65 rockchip:midgard:1,keep processing if fence NULL 2,version to 0x05 2014-07-08 10:54:48 +08:00
黄涛
223378cc0f Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/mmc/host/Kconfig
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
	include/linux/mmc/rk_mmc.h
	include/linux/rockchip/cru.h
2014-07-07 21:01:04 +08:00
xxm
601170d9e7 rockchip:mali400:init r4p0-00rel0 for rk3036,version to 0x01 2014-07-04 10:47:51 +08:00
xxm
cdfa30f39d rockchip:mali400:1,update rk3036.dtsi with mali400 2,update mali400 build config 2014-07-01 15:27:23 +08:00
xxm
1c1008ad6c rockchip:midgard:1,katom->fence NULL workaround 2,version to 4 2014-06-24 16:42:20 +08:00
xxm
bc5ad52517 rockchip:midgard:1,compatible with rk3288 ft project 2,version to 3 2014-06-16 16:20:26 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
xxm
511fc892af rockchip:midgard:1,update version to r4p1-02dev0 2,disable ve configuration when CONFIG_MALI_DEBUG enabled 3,device driver version to 2 2014-06-12 16:10:18 +08:00
Chris Wilson
fe01110735 drm/i915: Only copy back the modified fields to userspace from execbuffer
commit 9aab8bff7a upstream.

We only want to modifiy a single field in the userspace view of the
execbuffer command buffer, so explicitly change that rather than copy
everything back again.

This serves two purposes:

1. The single fields are much cheaper to copy (constant size so the
copy uses special case code) and much smaller than the whole array.

2. We modify the array for internal use that need to be masked from
the user.

Note: We need this backported since without it the next bugfix will
blow up when userspace recycles batchbuffers and relocations.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:24 -07:00
Alex Deucher
caf3d430ba drm/radeon: handle non-VGA class pci devices with ATRM
commit d8ade3526b upstream.

Newer PX systems have non-VGA pci class dGPUs.  Update
the ATRM fetch method to handle those cases.

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=75401

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:23 -07:00
Christian König
739b79fb90 drm/radeon: also try GART for CPU accessed buffers
commit 544092596e upstream.

Placing them exclusively into VRAM might not work all the time.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=78297

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:23 -07:00
Ben Skeggs
df9cddcf99 drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
commit 0f1d360b2e upstream.

Fixes a LVDS bleed issue on Lenovo W530 that can occur under a
number of circumstances.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:22 -07:00
Martin Peres
d3f09691b3 drm/nouveau/pm/fan: drop the fan lock in fan_update() before rescheduling
commit 61679fe153 upstream.

This should fix a deadlock that has been reported to us where fan_update()
would hold the fan lock and try to grab the alarm_program_lock to reschedule
an update. On an other CPU, the alarm_program_lock would have been taken
before calling fan_update(), leading to a deadlock.

We should Cc: <stable@vger.kernel.org> # 3.9+

Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Tested-by: Timothée Ravier <tim@siosm.fr>
Tested-by: Boris Fersing (IRC nick fersingb, no public email address)
Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-07 13:25:34 -07:00
Ilia Mirkin
bfb0756180 drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
commit a3d0b1218d upstream.

There appear to be a crop of new hardware where the vbios is not
available from PROM/PRAMIN, but there is a valid _ROM method in ACPI.
The data read from PCIROM almost invariably contains invalid
instructions (still has the x86 opcodes), which makes this a low-risk
way to try to obtain a valid vbios image.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76475
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-07 13:25:34 -07:00
Leo Liu
18cb317078 drm/radeon: check buffer relocation offset
commit 695daf1a8e upstream.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-07 13:25:32 -07:00