mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-26 20:44:32 +08:00
eb493fbc15
Currently nouveau doesn't actually expose the state debugfs file that's usually provided for any modesetting driver that supports atomic, even if nouveau is loaded with atomic=1. This is due to the fact that the standard debugfs files that DRM creates for atomic drivers is called when drm_get_pci_dev() is called from nouveau_drm.c. This happens well before we've initialized the display core, which is currently responsible for setting the DRIVER_ATOMIC cap. So, move the atomic option into nouveau_drm.c and just add the DRIVER_ATOMIC cap whenever it's enabled on the kernel commandline. This shouldn't cause any actual issues, as the atomic ioctl will still fail as expected even if the display core doesn't disable it until later in the init sequence. This also provides the added benefit of being able to use the state debugfs file to check the current display state even if clients aren't allowed to modify it through anything other than the legacy ioctls. Additionally, disable the DRIVER_ATOMIC cap in nv04's display core, as this was already disabled there previously. Signed-off-by: Lyude Paul <lyude@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
179 lines
5.1 KiB
C
179 lines
5.1 KiB
C
/*
|
|
* Copyright 2009 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Author: Ben Skeggs
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include "nouveau_drv.h"
|
|
#include "nouveau_reg.h"
|
|
#include "hw.h"
|
|
#include "nouveau_encoder.h"
|
|
#include "nouveau_connector.h"
|
|
|
|
int
|
|
nv04_display_create(struct drm_device *dev)
|
|
{
|
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
|
struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
|
|
struct dcb_table *dcb = &drm->vbios.dcb;
|
|
struct drm_connector *connector, *ct;
|
|
struct drm_encoder *encoder;
|
|
struct nouveau_encoder *nv_encoder;
|
|
struct nouveau_crtc *crtc;
|
|
struct nv04_display *disp;
|
|
int i, ret;
|
|
|
|
disp = kzalloc(sizeof(*disp), GFP_KERNEL);
|
|
if (!disp)
|
|
return -ENOMEM;
|
|
|
|
nvif_object_map(&drm->client.device.object, NULL, 0);
|
|
|
|
nouveau_display(dev)->priv = disp;
|
|
nouveau_display(dev)->dtor = nv04_display_destroy;
|
|
nouveau_display(dev)->init = nv04_display_init;
|
|
nouveau_display(dev)->fini = nv04_display_fini;
|
|
|
|
/* Pre-nv50 doesn't support atomic, so don't expose the ioctls */
|
|
dev->driver->driver_features &= ~DRIVER_ATOMIC;
|
|
|
|
nouveau_hw_save_vga_fonts(dev, 1);
|
|
|
|
nv04_crtc_create(dev, 0);
|
|
if (nv_two_heads(dev))
|
|
nv04_crtc_create(dev, 1);
|
|
|
|
for (i = 0; i < dcb->entries; i++) {
|
|
struct dcb_output *dcbent = &dcb->entry[i];
|
|
|
|
connector = nouveau_connector_create(dev, dcbent->connector);
|
|
if (IS_ERR(connector))
|
|
continue;
|
|
|
|
switch (dcbent->type) {
|
|
case DCB_OUTPUT_ANALOG:
|
|
ret = nv04_dac_create(connector, dcbent);
|
|
break;
|
|
case DCB_OUTPUT_LVDS:
|
|
case DCB_OUTPUT_TMDS:
|
|
ret = nv04_dfp_create(connector, dcbent);
|
|
break;
|
|
case DCB_OUTPUT_TV:
|
|
if (dcbent->location == DCB_LOC_ON_CHIP)
|
|
ret = nv17_tv_create(connector, dcbent);
|
|
else
|
|
ret = nv04_tv_create(connector, dcbent);
|
|
break;
|
|
default:
|
|
NV_WARN(drm, "DCB type %d not known\n", dcbent->type);
|
|
continue;
|
|
}
|
|
|
|
if (ret)
|
|
continue;
|
|
}
|
|
|
|
list_for_each_entry_safe(connector, ct,
|
|
&dev->mode_config.connector_list, head) {
|
|
if (!connector->encoder_ids[0]) {
|
|
NV_WARN(drm, "%s has no encoders, removing\n",
|
|
connector->name);
|
|
connector->funcs->destroy(connector);
|
|
}
|
|
}
|
|
|
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
|
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
|
struct nvkm_i2c_bus *bus =
|
|
nvkm_i2c_bus_find(i2c, nv_encoder->dcb->i2c_index);
|
|
nv_encoder->i2c = bus ? &bus->i2c : NULL;
|
|
}
|
|
|
|
/* Save previous state */
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head)
|
|
crtc->save(&crtc->base);
|
|
|
|
list_for_each_entry(nv_encoder, &dev->mode_config.encoder_list, base.base.head)
|
|
nv_encoder->enc_save(&nv_encoder->base.base);
|
|
|
|
nouveau_overlay_init(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
nv04_display_destroy(struct drm_device *dev)
|
|
{
|
|
struct nv04_display *disp = nv04_display(dev);
|
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
|
struct nouveau_encoder *encoder;
|
|
struct nouveau_crtc *nv_crtc;
|
|
|
|
/* Restore state */
|
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.base.head)
|
|
encoder->enc_restore(&encoder->base.base);
|
|
|
|
list_for_each_entry(nv_crtc, &dev->mode_config.crtc_list, base.head)
|
|
nv_crtc->restore(&nv_crtc->base);
|
|
|
|
nouveau_hw_save_vga_fonts(dev, 0);
|
|
|
|
nouveau_display(dev)->priv = NULL;
|
|
kfree(disp);
|
|
|
|
nvif_object_unmap(&drm->client.device.object);
|
|
}
|
|
|
|
int
|
|
nv04_display_init(struct drm_device *dev)
|
|
{
|
|
struct nouveau_encoder *encoder;
|
|
struct nouveau_crtc *crtc;
|
|
|
|
/* meh.. modeset apparently doesn't setup all the regs and depends
|
|
* on pre-existing state, for now load the state of the card *before*
|
|
* nouveau was loaded, and then do a modeset.
|
|
*
|
|
* best thing to do probably is to make save/restore routines not
|
|
* save/restore "pre-load" state, but more general so we can save
|
|
* on suspend too.
|
|
*/
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head)
|
|
crtc->save(&crtc->base);
|
|
|
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.base.head)
|
|
encoder->enc_save(&encoder->base.base);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
nv04_display_fini(struct drm_device *dev)
|
|
{
|
|
/* disable vblank interrupts */
|
|
NVWriteCRTC(dev, 0, NV_PCRTC_INTR_EN_0, 0);
|
|
if (nv_two_heads(dev))
|
|
NVWriteCRTC(dev, 1, NV_PCRTC_INTR_EN_0, 0);
|
|
}
|