summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
Commit message (Collapse)AuthorAgeFilesLines
* drm/i915, HD-audio: Don't continue probing when nomodeset is givenTakashi Iwai2014-06-161-6/+8
| | | | | | | | | | | | | | | | | When a machine is booted with nomodeset option, i915 driver skips the whole initialization. Meanwhile, HD-audio tries to bind wth i915 just by request_symbol() without knowing that the initialization was skipped, and eventually it hits WARN_ON() in i915_request_power_well() and i915_release_power_well() wrongly but still continues probing, even though it doesn't work at all. In this patch, both functions are changed to return an error in case of uninitialized state instead of WARN_ON(), so that HD-audio driver can give up HDMI controller initialization at the right time. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: <stable@vger.kernel.org> [3.15] Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2014-06-12396-9398/+26660
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull drm updates from Dave Airlie: "This is the main drm merge window pull request, changes all over the place, mostly normal levels of churn. Highlights: Core drm: More cleanups, fix race on connector/encoder naming, docs updates, object locking rework in prep for atomic modeset i915: mipi DSI support, valleyview power fixes, cursor size fixes, execlist refactoring, vblank improvements, userptr support, OOM handling improvements radeon: GPUVM tuning and large page size support, gart fixes, deep color HDMI support, HDMI audio cleanups nouveau: - displayport rework should fix lots of issues - initial gk20a support - gk110b support - gk208 fixes exynos: probe order fixes, HDMI changes, IPP consolidation msm: debugfs updates, misc fixes ast: ast2400 support, sync with UMS driver tegra: cleanups, hdmi + hw cursor for Tegra 124. panel: fixes existing panels add some new ones. ipuv3: moved from staging to drivers/gpu" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits) drm/nouveau/disp/dp: fix tmds passthrough on dp connector drm/nouveau/dp: probe dpcd to determine connectedness drm/nv50-: trigger update after all connectors disabled drm/nv50-: prepare for attaching a SOR to multiple heads drm/gf119-/disp: fix debug output on update failure drm/nouveau/disp/dp: make use of postcursor when its available drm/g94-/disp/dp: take max pullup value across all lanes drm/nouveau/bios/dp: parse lane postcursor data drm/nouveau/dp: fix support for dpms drm/nouveau: register a drm_dp_aux channel for each dp connector drm/g94-/disp: add method to power-off dp lanes drm/nouveau/disp/dp: maintain link in response to hpd signal drm/g94-/disp: bash and wait for something after changing lane power regs drm/nouveau/disp/dp: split link config/power into two steps drm/nv50/disp: train PIOR-attached DP from second supervisor drm/nouveau/disp/dp: make use of existing output data for link training drm/gf119/disp: start removing direct vbios parsing from supervisor drm/nv50/disp: start removing direct vbios parsing from supervisor drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal drm/nouveau/disp/dp: create subclass for dp outputs ...
| * Merge branch 'drm-nouveau-next' of ↵Dave Airlie2014-06-1190-1486/+3346
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next display rework fixes lots of displayport issues. * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (43 commits) drm/nouveau/disp/dp: fix tmds passthrough on dp connector drm/nouveau/dp: probe dpcd to determine connectedness drm/nv50-: trigger update after all connectors disabled drm/nv50-: prepare for attaching a SOR to multiple heads drm/gf119-/disp: fix debug output on update failure drm/nouveau/disp/dp: make use of postcursor when its available drm/g94-/disp/dp: take max pullup value across all lanes drm/nouveau/bios/dp: parse lane postcursor data drm/nouveau/dp: fix support for dpms drm/nouveau: register a drm_dp_aux channel for each dp connector drm/g94-/disp: add method to power-off dp lanes drm/nouveau/disp/dp: maintain link in response to hpd signal drm/g94-/disp: bash and wait for something after changing lane power regs drm/nouveau/disp/dp: split link config/power into two steps drm/nv50/disp: train PIOR-attached DP from second supervisor drm/nouveau/disp/dp: make use of existing output data for link training drm/gf119/disp: start removing direct vbios parsing from supervisor drm/nv50/disp: start removing direct vbios parsing from supervisor drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal drm/nouveau/disp/dp: create subclass for dp outputs ...
| | * drm/nouveau/disp/dp: fix tmds passthrough on dp connectorBen Skeggs2014-06-112-10/+54
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/dp: probe dpcd to determine connectednessBen Skeggs2014-06-113-40/+26
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nv50-: trigger update after all connectors disabledBen Skeggs2014-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | We were sending the necessary state changes to unset the mode, but never actually hit the big GO button unless another modeset happens afterwards. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nv50-: prepare for attaching a SOR to multiple headsBen Skeggs2014-06-113-42/+46
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/gf119-/disp: fix debug output on update failureBen Skeggs2014-06-111-3/+3
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: make use of postcursor when its availableBen Skeggs2014-06-111-8/+18
| | | | | | | | | | | | | | | | | | And at the same time, obey the spec better wrt out-of-range requests. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/g94-/disp/dp: take max pullup value across all lanesBen Skeggs2014-06-112-2/+6
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/bios/dp: parse lane postcursor dataBen Skeggs2014-06-114-24/+27
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/dp: fix support for dpmsBen Skeggs2014-06-112-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SOR_PWR has no effect to power-off DP links, unlike other SOR protocols. Instead, on the source side, we cut power to the lanes after having put the sink into D3. Link training takes care of everything required to bring it back again. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau: register a drm_dp_aux channel for each dp connectorBen Skeggs2014-06-112-3/+55
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/g94-/disp: add method to power-off dp lanesBen Skeggs2014-06-115-0/+35
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: maintain link in response to hpd signalBen Skeggs2014-06-116-12/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | This previously worked for the most part due to userspace doing a modeset in response to HPD interrupts. This will allow us to properly handle cases where sync is lost for other reasons, or if userspace isn't caring. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/g94-/disp: bash and wait for something after changing lane power regsBen Skeggs2014-06-111-0/+3
| | | | | | | | | | | | | | | | | | Some kind of update? Needed to make the power-down take effect at least. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: split link config/power into two stepsBen Skeggs2014-06-116-12/+29
| | | | | | | | | | | | | | | | | | We want to be able to power down the lanes for DPMS off. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nv50/disp: train PIOR-attached DP from second supervisorBen Skeggs2014-06-111-21/+11
| | | | | | | | | | | | | | | | | | Same place as for SOR, between detach and attach phases. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: make use of existing output data for link trainingBen Skeggs2014-06-1116-248/+133
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/gf119/disp: start removing direct vbios parsing from supervisorBen Skeggs2014-06-111-75/+83
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nv50/disp: start removing direct vbios parsing from supervisorBen Skeggs2014-06-111-107/+116
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: maintain receiver caps in response to hpd signalBen Skeggs2014-06-112-8/+68
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: create subclass for dp outputsBen Skeggs2014-06-1116-9/+265
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau: use connector events for HPD instead of GPIO watchingBen Skeggs2014-06-113-44/+34
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp: add internal representaion of output paths and connectorsBen Skeggs2014-06-1110-2/+619
| | | | | | | | | | | | | | | | | | | | | | | | This will, at some point, be used to replace various bits and pieces of code doing direct bios parsing. For now, it'll just be used for some DP improvements. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/bios: extend connector table parsingBen Skeggs2014-06-114-16/+79
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp: nothing to see hereBen Skeggs2014-06-113-21/+42
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c/anx9805: add debugging to aux transactionsBen Skeggs2014-06-112-5/+34
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: introduce locking at a per-port levelBen Skeggs2014-06-1114-34/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's also provisions to allow a pad to be locked with a specific routing, for an indefinite period of time. This will be used in future patches. The G94+ pad driver will now also power-down pads when not required. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: balance port acquire/releaseBen Skeggs2014-06-114-14/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a half-finished hack before, just enough to handle the shared aux/i2c pad thing on G94 and up. We got lucky with locking etc up until now, as this was (generally) all protected by the DRM mode_config lock. It's about to become a lot more likely to hit the races. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/gk104/i2c: add aux channel interrupt driverBen Skeggs2014-06-116-6/+79
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/g94/i2c: add aux channel interrupt driverBen Skeggs2014-06-113-0/+39
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: add interfaces to support handling aux channel interruptsBen Skeggs2014-06-114-0/+94
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: start hiding subdev-internal interfacesBen Skeggs2014-06-1121-236/+194
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: remove unnecessary i2c_set_adapdata()Ben Skeggs2014-06-111-2/+0
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/i2c: properly hand aux reply back to caller, and only retry on deferBen Skeggs2014-06-114-14/+20
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nv50-/mc: also pass PMGR interrupts onto I2C subdevBen Skeggs2014-06-113-3/+6
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: send separate event types for high/low transitionsBen Skeggs2014-06-114-14/+17
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: use base constructor for all implementationsBen Skeggs2014-06-118-119/+47
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: move on-reset intr disable-and-ack to common codeBen Skeggs2014-06-117-138/+80
| | | | | | | | | | | | | | | | | | | | | Re-uses the implementation's accessor functions rather than requiring and init/fini implementation for each chipset. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: split "toggled" interrupt into "went high" / "went low"Ben Skeggs2014-06-117-114/+156
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: split g92 class from nv50Ben Skeggs2014-06-1111-58/+110
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/gpio: use indirect pointer to base class definitionBen Skeggs2014-06-1113-75/+75
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: support training to highest rate, rather than a targetBen Skeggs2014-06-111-23/+34
| | | | | | | | | | | | | | | | | | We really want this for, at least, MST devices. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/disp/dp: support postcursor in link trainingBen Skeggs2014-06-112-11/+53
| | | | | | | | | | | | | | | | | | | | | Not enabled at the backends yet, but will read status and send back max reached at level 0. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| | * drm/nouveau/core: allow event source to handle multiple event types per indexBen Skeggs2014-06-1121-77/+112
| | | | | | | | | | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| * | Merge branch 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux ↵Dave Airlie2014-06-1110-0/+3545
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into drm-next Destage IPUv3 * 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: Register the CSI modules gpu: ipu-v3: Add CSI and SMFC module enable wrappers gpu: ipu-v3: Add ipu_idmac_get_current_buffer function gpu: ipu-v3: Add SMFC code gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging
| | * | gpu: ipu-v3: Register the CSI modulesPhilipp Zabel2014-06-041-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch registers the two CSI platform devices per IPU. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
| | * | gpu: ipu-v3: Add CSI and SMFC module enable wrappersPhilipp Zabel2014-06-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPU_CONF_..._EN bits are implementation details, not to be made public. Add wrappers around ipu_module_enable/disable, so the CSI V4L2 driver can enable/disable the CSI and SMFC modules. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
| | * | gpu: ipu-v3: Add ipu_idmac_get_current_buffer functionPhilipp Zabel2014-06-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function returns the currently active buffer (0 or 1) of a double buffered IDMAC channel. It is to be used by the CSI driver. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
OpenPOWER on IntegriCloud