OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
287,381 Commits 4 Branches 0 Tags 2 GiB
Commit Graph

287381 Commits

Author SHA1 Message Date
Ben Skeggs f3298532f7 drm/nvc0: add initial memory type detection 
Uses only the VBIOS tables, from what I can tell this is what NVIDIA do
too, I was able to change the detected memory type by modifying this table
on a NVC1 chipset.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:52 +10:00
Ben Skeggs c70c41e89f drm/nv50: hopefully handle the DDR2/DDR3 memtype detection somewhat better 
M version 2 appears to have a table with some form of memory type info
available.

NVIDIA appear to ignore the table information except for this DDR2/DDR3
case (which has the same value in 0x100714).  My guess is this is due to
some of the supported memory types not being represented in the table.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:46 +10:00
Ben Skeggs 1072856a1c drm/nv50: add memory type detection 
DDR1/DDR[23] confirmed on NVA8 (see note about DDR3 in source) by changing
the value and watching the binary driver's behaviour.

GDDR3/4 values confirmed on a NV96 via the same method above.  That GDDR4
is present is interesting, as far as I can see no boards using it were ever
released.

GDDR5 value is based on VBIOS images of known GDDR5 boards.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:40 +10:00
Ben Skeggs ff92a6cda7 drm/nv20-nv40: add memory type detection 
NV20/NV30 is partially educated guesswork at this point, based on any
information around about available memory types and a horribly unspeakable
amount of vbios image scouring.  I'm not entirely certain the GDDR3 define
is correct, I have not spotted a single vbios with that value yet (though
it is mentioned in some 1218-using nv4x vbios), but there are reports that
some nv3x did use it..

NV40(100914) confirmed by switching an NV49 to DDR1/DDR2 values and making
sure that the binary driver behaviour showed it had detected DDR1/DDR2
instead of GDDR3 before dying horribly.

NV40(100474) confirmed by doing much the same task as above on an NV44,
except this was *much* easier as changing the values didn't seem to have
any noticable effect on the memory controller aside from changing the
binary driver's behaviour.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:35 +10:00
Ben Skeggs d81c19e312 drm/nv20: split PFB code out of nv10_fb.c 
Most functions were quite different between NV10/NV20 already, and they're
about to get even more so.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:29 +10:00
Ben Skeggs ddfd2da484 drm/nouveau: memory type detection for the really old chipsets 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:23 +10:00
Ben Skeggs 7ad2d31cb6 drm/nouveau: move vram detection funcs to chipset-specific fb code 
Also, display detected memory type in logs - though, we don't even try to
detect this yet.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2012-03-13 17:05:20 +10:00
Dave Airlie 83465324cb Merge branch 'drm-gma500-alanc' into drm-core-next 
* drm-gma500-alanc: (47 commits)
  gma500: psb_irq: mark mid_{enable, disable}_pipe_event() as static
  gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static
  gma500: psb_intel_display: drop unused variables
  gma500: mark psb_intel_pipe_set_base() as static
  gma500: drop unused psb_intel_modeset_cleanup()
  gma500: oaktrail_lvds_init() drop unused variable
  gma500: oaktrail_hdmi_i2c_access() drop unused variable
  gma500: mark oaktrail_backlight_init() as static
  gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning
  gma500: oaktrail_hdmi: drop dead code
  gma500: oaktrail_crtc: drop unused variables
  gma500: oaktrail_crtc: mark few functions as static
  gma500: mdfld_intel_display: drop unused variables
  gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning
  gma500: mdfld_dsi_dpi: drop unused variables
  gma500: mdfld_device: mark few functions as static
  gma500: cdv_intel_lvds: #if 0 currently unused functions
  gma500: cdv_intel_lvds: mark few functions as static
  gma500: cdv_intel_hdmi: add missing include
  gma500: cdv_intel_crt: mark few functions as static
  ...
 2012-03-10 13:10:41 +00:00
Kirill A. Shutemov 8e18db815c gma500: psb_irq: mark mid_{enable, disable}_pipe_event() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:40 +00:00
Kirill A. Shutemov f42aaa6f7c gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:39 +00:00
Kirill A. Shutemov 2e33d6b92f gma500: psb_intel_display: drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:38 +00:00
Kirill A. Shutemov 3c1d08d7af gma500: mark psb_intel_pipe_set_base() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:37 +00:00
Kirill A. Shutemov 412a3df1ce gma500: drop unused psb_intel_modeset_cleanup() 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:35 +00:00
Kirill A. Shutemov cc2e991c15 gma500: oaktrail_lvds_init() drop unused variable 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:35 +00:00
Kirill A. Shutemov 1e30296a60 gma500: oaktrail_hdmi_i2c_access() drop unused variable 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:34 +00:00
Kirill A. Shutemov 771f64d027 gma500: mark oaktrail_backlight_init() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:33 +00:00
Kirill A. Shutemov 6e7f45736e gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:32 +00:00
Kirill A. Shutemov e1bb07cbe1 gma500: oaktrail_hdmi: drop dead code 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:31 +00:00
Kirill A. Shutemov 4398e58c5f gma500: oaktrail_crtc: drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:30 +00:00
Kirill A. Shutemov 44332ddfeb gma500: oaktrail_crtc: mark few functions as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:29 +00:00
Kirill A. Shutemov cbc5a1850d gma500: mdfld_intel_display: drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:28 +00:00
Kirill A. Shutemov c7a5ae2f23 gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:28 +00:00
Kirill A. Shutemov e4b9ff716f gma500: mdfld_dsi_dpi: drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:27 +00:00
Kirill A. Shutemov 1c6a62680b gma500: mdfld_device: mark few functions as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:26 +00:00
Kirill A. Shutemov 062d054eb3 gma500: cdv_intel_lvds: #if 0 currently unused functions 
cdv_intel_lvds_set_brightness() is only used in commented out code in
cdv_set_brightness().

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:25 +00:00
Kirill A. Shutemov bc11da70ac gma500: cdv_intel_lvds: mark few functions as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:24 +00:00
Kirill A. Shutemov 455b9e91f2 gma500: cdv_intel_hdmi: add missing include 
drivers/gpu/drm/gma500/cdv_intel_hdmi.c:305:6: warning: no previous prototype for 'cdv_hdmi_init' [-Wmissing-prototypes]

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:23 +00:00
Kirill A. Shutemov 657da160cc gma500: cdv_intel_crt: mark few functions as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:21 +00:00
Kirill A. Shutemov 0313c0de54 gma500: cdv_intel_crt: drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:20 +00:00
Kirill A. Shutemov a8ec622965 gma500: cdv_intel_crt: drop dead code 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:18 +00:00
Kirill A. Shutemov 2acdc9fa7e gma500: cdv_intel_crt: add missing include 
drivers/gpu/drm/gma500/cdv_intel_crt.c:273:6: warning: no previous prototype for 'cdv_intel_crt_init' [-Wmissing-prototypes]

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:17 +00:00
Kirill A. Shutemov 017350bcb0 gma500: fix cdv_intel_wait_for_vblank() prototype 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:15 +00:00
Kirill A. Shutemov aa53f5331c gma500: fix two -Wmissing-field-initializers warnings 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:13 +00:00
Kirill A. Shutemov 15308e23fb gma500: mark psb_driver_device_is_agp() and psb_driver_preclose() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:08 +00:00
Kirill A. Shutemov 1fc93332cd gma500: psb_driver_load(): drop unused variables 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:05 +00:00
Kirill A. Shutemov 699f0b45ce gma500: fix ioctl confict 
Move DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with
DRM_GMA_GEM_MMAP.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:04 +00:00
Kirill A. Shutemov 670c044454 gma500: use DRM_IOCTL_DEF_DRV instead of custom PSB_IOCTL_DEF 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:02 +00:00
Kirill A. Shutemov 3afad3c2bc gma500: mmu: mark psb_mmu_free_pt() and psb_mmu_pt_alloc_map_lock() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:01 +00:00
Kirill A. Shutemov b2d57b337f gma500: mmu: drop unused psb_get_default_pd_addr() 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:06:00 +00:00
Kirill A. Shutemov ffe94d9c75 gma500: gtt: mark psb_gtt_entry() and psb_gtt_alloc() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:59 +00:00
Kirill A. Shutemov bc7f2b0839 gma500: mark psb_fbdev_destroy() and psb_fbdev_fini() as static 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:58 +00:00
Kirill A. Shutemov 4796001a7d gma500: drop unused psbfb_suspend()/psbfb_resume() 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:57 +00:00
Kirill A. Shutemov a58df0ade9 gma500: gem_glue: add missing include 
It fixes W=1 warnings:

drivers/gpu/drm/gma500/gem_glue.c:23:6: warning: no previous prototype for ‘drm_gem_object_release_wrap’ [-Wmissing-prototypes]
drivers/gpu/drm/gma500/gem_glue.c:44:5: warning: no previous prototype for ‘gem_create_mmap_offset’ [-Wmissing-prototypes]

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:56 +00:00
Kirill A. Shutemov 89f58dcdf9 gma500: medfield: drop a bit of dead code 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:52 +00:00
Kirill A. Shutemov fda95c2e73 gma500: mdfld_dsi_output_init() drop unused parameter 
Nobody uses 'config' parameter.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:51 +00:00
Kirill A. Shutemov 6aa1ead1b8 gma500: psbfb_create(): move depth initialization out of loop 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:50 +00:00
Kirill A. Shutemov 026abc3332 gma500: initial medfield merge 
We need to merge this ahead of some of the cleanup because a lot of needed
cleanup spans both new and old chips. If we try and clean up and the merge
we end up fighting ourselves.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
[With a load of the cleanup stuff folded in, register stuff reworked sanely]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:48 +00:00
Alan Cox c6265ff593 gma500: rework register stuff sanely 
Rework registers handling to prepare for Medfield.

Signed-off-by: Alan Cox <alan@linux.intel.com>
[split out from a single big patch]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:44 +00:00
Kirill A. Shutemov c715bc1bf4 gma500: make init_pm callback in struct psb_op optional 
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:42 +00:00
Alan Cox 4578240b48 gma500: re-order calling on the fix setup so we set up after the DRM layer 
Noted by Kirill A Shutemov

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-10 13:05:39 +00:00