455fa6518a
This update brings few features:
o Support for the setmaster/dropmaster ioctls. For instance, they
are used to run multiple X servers simultaneously.
o Support for minor devices. The only user-visible change is a new
entry in /dev/dri but it is useless at the moment. This is a
first step to support render nodes [1].
The main benefit is to greatly reduce the diff with Linux (at the
expense of an unreadable commit diff). Hopefully, next upgrades will be
easier.
No updates were made to the drivers, beside adapting them to API
changes.
[1] https://en.wikipedia.org/wiki/Direct_Rendering_Manager#Render_nodes
Tested by: Many people
MFC after: 1 month
Relnotes: yes
143 lines
3.9 KiB
C
143 lines
3.9 KiB
C
/*
|
|
* Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
|
|
* Copyright (c) 2007, 2010 Intel Corporation
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
*
|
|
* 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 (including the next
|
|
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <dev/drm2/drmP.h>
|
|
#include <dev/drm2/drm.h>
|
|
#include <dev/drm2/i915/i915_drm.h>
|
|
#include <dev/drm2/i915/i915_drv.h>
|
|
#include <dev/drm2/i915/intel_drv.h>
|
|
#include <dev/drm2/drm_edid.h>
|
|
#include <dev/iicbus/iiconf.h>
|
|
|
|
/**
|
|
* intel_ddc_probe
|
|
*
|
|
*/
|
|
bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
|
|
{
|
|
struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
|
|
u8 out_buf[] = { 0x0, 0x0};
|
|
u8 buf[2];
|
|
struct iic_msg msgs[] = {
|
|
{
|
|
.slave = DDC_ADDR << 1,
|
|
.flags = IIC_M_WR,
|
|
.len = 1,
|
|
.buf = out_buf,
|
|
},
|
|
{
|
|
.slave = DDC_ADDR << 1,
|
|
.flags = IIC_M_RD,
|
|
.len = 1,
|
|
.buf = buf,
|
|
}
|
|
};
|
|
|
|
return (iicbus_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
|
|
msgs, 2) == 0/* XXXKIB 2*/);
|
|
}
|
|
|
|
/**
|
|
* intel_ddc_get_modes - get modelist from monitor
|
|
* @connector: DRM connector device to use
|
|
* @adapter: i2c adapter
|
|
*
|
|
* Fetch the EDID information from @connector using the DDC bus.
|
|
*/
|
|
int
|
|
intel_ddc_get_modes(struct drm_connector *connector, device_t adapter)
|
|
{
|
|
struct edid *edid;
|
|
int ret = 0;
|
|
|
|
edid = drm_get_edid(connector, adapter);
|
|
if (edid) {
|
|
drm_mode_connector_update_edid_property(connector, edid);
|
|
ret = drm_add_edid_modes(connector, edid);
|
|
drm_edid_to_eld(connector, edid);
|
|
free(edid, DRM_MEM_KMS);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_prop_enum_list force_audio_names[] = {
|
|
{ HDMI_AUDIO_OFF_DVI, "force-dvi" },
|
|
{ HDMI_AUDIO_OFF, "off" },
|
|
{ HDMI_AUDIO_AUTO, "auto" },
|
|
{ HDMI_AUDIO_ON, "on" },
|
|
};
|
|
|
|
void
|
|
intel_attach_force_audio_property(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct drm_property *prop;
|
|
|
|
prop = dev_priv->force_audio_property;
|
|
if (prop == NULL) {
|
|
prop = drm_property_create_enum(dev, 0,
|
|
"audio",
|
|
force_audio_names,
|
|
ARRAY_SIZE(force_audio_names));
|
|
if (prop == NULL)
|
|
return;
|
|
|
|
dev_priv->force_audio_property = prop;
|
|
}
|
|
drm_object_attach_property(&connector->base, prop, 0);
|
|
}
|
|
|
|
static const struct drm_prop_enum_list broadcast_rgb_names[] = {
|
|
{ 0, "Full" },
|
|
{ 1, "Limited 16:235" },
|
|
};
|
|
|
|
void
|
|
intel_attach_broadcast_rgb_property(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct drm_property *prop;
|
|
|
|
prop = dev_priv->broadcast_rgb_property;
|
|
if (prop == NULL) {
|
|
prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
|
|
"Broadcast RGB",
|
|
broadcast_rgb_names,
|
|
ARRAY_SIZE(broadcast_rgb_names));
|
|
if (prop == NULL)
|
|
return;
|
|
|
|
dev_priv->broadcast_rgb_property = prop;
|
|
}
|
|
|
|
drm_object_attach_property(&connector->base, prop, 0);
|
|
}
|