aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-07-05gma500: Update the GEM todoAlan Cox2-14/+10
We also pull out the undo side of the mmap offset processing so we can later push it into GEM where it belongs Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: psb_fb tidy/cleanup passAlan Cox4-125/+29
Eliminate unused stuff and clean up the code ordering. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Extract BIOSisy stuff from psb_drvAlan Cox4-208/+260
This is too big already so lets rip out more of the device specific crud. It also means we pull the ugly stuff that needs work out of our main line of cleanup. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Move our other GEM helper into the bits want to push into GEMAlan Cox3-56/+56
Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Medfield supportAlan Cox36-49/+9005
This large patch adds all the basics for Medfield support. Lots of clean up needed in this area still. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: 2D polishAlan Cox3-127/+74
Tidy up the 2D bits. For the fill case the CPU seems to be able to outperform the graphics engine for the cases we get, so don't bother fixing it but throw it out. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: CodingStyle passAlan Cox15-1140/+1156
Start the style cleanup Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Use the GEM tweaks to provide a GEM frame bufferAlan Cox2-7/+15
We can now make our system frame buffer a GEM object. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: GEM glueAlan Cox3-1/+53
Add this temporarily so we can keep making progress and also bundle all the GEM bits we need together in our staging driver while we get them into GEM itself. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Kill spare krefAlan Cox3-37/+6
We are using the underlying kref in the GEM object so we don't need our own Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: nuke the PSB debug stuffAlan Cox14-374/+87
Lose all the PSB debug gunge. We can replace it with dev_dbg() like normal drivers if and when we need debug on stuff. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: nuke the last bits of TTM codeAlan Cox2-49/+19
We don't seem to need this for our task. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: 2D acceleration tidyingAlan Cox1-6/+13
We have a FIXME to do the power management for which the framework now exists, and we also need to deal with an erratum. Some operations exactly 8 pixels wide or high fail. The work around is to do two smaller ones (see the Intel released X driver bits) but for console quite frankly if it's 8bits wide and/or high its not worth it so fall back. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: polish for completion of this phaseAlan Cox15-177/+67
Give the driver its own proper DRM name, clean up copyright headers and so forth Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: trim some of the debugAlan Cox3-18/+1
Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Do sane FB cleanupAlan Cox2-10/+36
If we get a user frame buffer destroyed which is being displayed then clean up the mess nicely. We can now run a slightly modified modetest including setting modes, and handling crashes. Modetest still blows up but this is because libdrm 2.4.25 is busted. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: revamp frame buffer creation and handlingAlan Cox5-97/+133
Restructure this to work the same way as the i915 frame buffer does. That cleans up various chunks of code. We can now set a mode in modetest but mode restore is a bit iffy Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05gma500: Ensure the frame buffer has a linear virtual mappingAlan Cox4-29/+42
We need this for the framebuffer in order to ensure that the kernel framebuffer layer can handle it when using KMS. Except for the base framebuffer this isn't a concern. Add an npage field to the gtt as too many copies of the page calculation are getting spread around the code. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-05Merge Linux 3.0-rc6 into staging-nextGreg Kroah-Hartman900-4978/+34253
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-07-04Linux 3.0-rc6Linus Torvalds1-1/+1
2011-07-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds40-7/+23622
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (277 commits) [SCSI] isci: fix checkpatch errors isci: Device reset should request sas_phy_reset(phy, true) isci: pare back error messsages isci: cleanup silicon revision detection isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.h isci: merge sata.[ch] into request.c isci: kill 'get/set' macros isci: retire scic_sds_ and scic_ prefixes isci: unify isci_host and scic_sds_controller isci: unify isci_remote_device and scic_sds_remote_device isci: unify isci_port and scic_sds_port isci: fix scic_sds_remote_device_terminate_requests isci: unify isci_phy and scic_sds_phy isci: unify isci_request and scic_sds_request isci: rename / clean up scic_sds_stp_request isci: preallocate requests isci: combine request flags isci: unify can_queue tracking on the tci_pool, uplevel tag assignment isci: Terminate dev requests on FIS err bit rx in NCQ isci: fix frame received locking ...
2011-07-04Merge branch 'at91/fixes' of ↵Linus Torvalds19-33/+34
git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc * 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc: AT91: Change nand buswidth logic to match hardware default configuration at91: Use "pclk" as con_id on at91cap9 and at91rm9200 at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl atmel_serial: fix internal port num at91: fix at91_set_serial_console: use platform device id
2011-07-04Merge branch 'fbdev-fixes-for-linus' of ↵Linus Torvalds9-34/+20
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x: vesafb: fix memory leak fbdev: amba: Link fb device to its parent fsl-diu-fb: remove check for pixel clock ranges udlfb: Correct sub-optimal resolution selection. hecubafb: add module_put on error path in hecubafb_probe() sm501fb: fix section mismatch warning gx1fb: Fix section mismatch warnings fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
2011-07-04RDMA: Check for NULL mode in .devnode methodsGoldwyn Rodrigues2-2/+4
Commits 71c29bd5c235 ("IB/uverbs: Add devnode method to set path/mode") and c3af0980ce01 ("IB: Add devnode methods to cm_class and umad_class") added devnode methods that set the mode. However, these methods don't check for a NULL mode, and so we get a crash when unloading modules because devtmpfs_delete_node() calls device_get_devnode() with mode == NULL. Add the missing checks. Signed-off-by: Goldwyn Rodrigues <[email protected]> [ Also fix cm.c. - Roland ] Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-07-04AT91: Change nand buswidth logic to match hardware default configurationNicolas Ferre7-11/+11
The recently modified nand buswitth configuration is not aligned with board reality: the double footprint on boards is always populated with 8bits buswidth nand flashes. So we have to consider that without particular configuration the 8bits buswidth is selected by default. Moreover, the previous logic was always using !board_have_nand_8bit(), we change it to a simpler: board_have_nand_16bit(). Signed-off-by: Nicolas Ferre <[email protected]> Tested-by: Ludovic Desroches <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
2011-07-04vesafb: fix memory leakDaniel J Blueman1-0/+1
When releasing framebuffer, free colourmap allocations. Signed-off-by: Daniel J Blueman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-07-03Merge branch 'pm-fixes' of ↵Linus Torvalds1-5/+21
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: Update documentation regarding driver removal PM: Documentation: fix typo: pm_runtime_idle_sync() doesn't exist.
2011-07-03[SCSI] isci: fix checkpatch errorsJames Bottomley5-42/+44
Signed-off-by: James Bottomley <[email protected]>
2011-07-03Merge git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isciJames Bottomley38-0/+23607
2011-07-03Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds1-8/+8
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: set socket send and receive timeouts before attempting connect
2011-07-03Merge branch 'hwmon-for-linus' of ↵Linus Torvalds7-22/+73
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (k10temp) Update documentation for Fam12h hwmon-vid: Fix typo in VIA CPU name hwmon: (f71882fg) Add support for the F71869A hwmon: Use <> rather than () around my e-mail address hwmon: (emc6w201) Properly handle all errors
2011-07-03hwmon: (k10temp) Update documentation for Fam12hClemens Ladisch1-2/+6
Add some CPU series IDs and links to the Fam12h datasheets. Signed-off-by: Clemens Ladisch <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-07-03hwmon-vid: Fix typo in VIA CPU nameJean Delvare1-1/+1
It's Nehemiah, not Nemiah. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-07-03hwmon: (f71882fg) Add support for the F71869AHans de Goede3-3/+20
The F71869A is almost the same as the F71869F/E, except that it has the normal number of temp and pwm zones for a F71882FG derived chip, rather then the limited number of the F71869F/E. Signed-off-by: Hans de Goede <[email protected]> Tested-by: Max Baldwin <[email protected]> Acked-by: Guenter Roeck <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-07-03hwmon: Use <> rather than () around my e-mail addressHans de Goede2-2/+2
Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-07-03hwmon: (emc6w201) Properly handle all errorsJean Delvare1-14/+44
Handle errors on 8-bit register reads and writes too. Also use likely and unlikely to make the functions faster on success. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-07-03isci: Device reset should request sas_phy_reset(phy, true)Jeff Skirvin1-12/+6
The hard_reset parameter passed to the LLDD in the direct-attached phy control case allows the LLDD to filter link failure events while the direct-attached device reset is executing. Signed-off-by: Jeff Skirvin <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: pare back error messsagesDan Williams2-28/+28
The messages emitted from task.c and some from request.c likely duplicate (in a less undertandable way) what is reported by the midlayer. Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: cleanup silicon revision detectionDan Williams5-73/+31
Perform checking per-pci device (even though all systems will only have 1 pci device in this generation), and delete support for silicon that does not report a proper revision (i.e. A0). Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: merge scu_unsolicited_frame.h into unsolicited_frame_control.hDan Williams4-120/+44
Does not need its own file. Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: merge sata.[ch] into request.cDan Williams7-378/+120
Undo some needless separation. Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: kill 'get/set' macrosDan Williams15-478/+188
Most of these simple dereference macros are longer than their open coded equivalent. Deleting enum sci_controller_mode is thrown in for good measure. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: retire scic_sds_ and scic_ prefixesDan Williams23-1943/+1449
The distinction between scic_sds_ scic_ and sci_ are no longer relevant so just unify the prefixes on sci_. The distinction between isci_ and sci_ is historically significant, and useful for comparing the old 'core' to the current Linux driver. 'sci_' represents the former core as well as the routines that are closer to the hardware and protocol than their 'isci_' brethren. sci == sas controller interface. Also unwind the 'sds1' out of the parameter structs. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: unify isci_host and scic_sds_controllerDan Williams16-985/+806
Remove the distinction between these two implementations and unify on isci_host (local instances named ihost). Hmmm, we had two 'oem_parameters' instances, one was unused... nice. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: unify isci_remote_device and scic_sds_remote_deviceDan Williams11-437/+365
Remove the distinction between these two implementations and unify on isci_remote_device (local instances named idev). Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: unify isci_port and scic_sds_portDan Williams10-581/+481
Remove the distinction between these two implementations and unify on isci_port (local instances named iport). The duplicate '->owning_port' and '->isci_port' in both isci_phy and isci_remote_device will be fixed in a later patch... this is just the straightforward rename/unification. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: fix scic_sds_remote_device_terminate_requestsDan Williams1-2/+2
Commit 0815632 "isci: unify remote_device stop_handlers" introduced the possibility that not all requests get terminated if we reach the request_count. Now that we properly reference count devices we don't need this self-defense and can do the straightforward scan of all active requests. Reported-by: Jeff Skirvin <[email protected]> Acked-by: Jeff Skirvin <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: unify isci_phy and scic_sds_phyDan Williams8-652/+500
They are one in the same object so remove the distinction. The near duplicate fields (owning_port, and isci_port) will be cleaned up after the scic_sds_port isci_port unification. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: unify isci_request and scic_sds_requestDan Williams13-615/+514
They are one in the same object so remove the distinction. The near duplicate fields (owning_controller, and isci_host) will be cleaned up after the scic_sds_contoller isci_host unification. Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2011-07-03isci: rename / clean up scic_sds_stp_requestDan Williams2-142/+89
* Rename scic_sds_stp_request to isci_stp_request * Remove the unused fields and union indirection Reported-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>