Merge tag 'drm-misc-next-2019-10-09-2' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.5:
UAPI Changes:
-Colorspace: Expose different prop values for DP vs. HDMI (Gwan-gyeong Mun)
-fourcc: Add DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED (Raymond)
-not_actually: s/ENOTSUPP/EOPNOTSUPP/ in drm_edid and drm_mipi_dbi. This should
not reach userspace, but adding here to specifically call that out (Daniel)
-i810: Prevent underflow in dispatch ioctls (Dan)
-komeda: Add ACLK sysfs attribute (Mihail)
-v3d: Allow userspace to clean up after render jobs (Iago)
Cross-subsystem Changes:
-MAINTAINERS:
-Add Alyssa & Steven as panfrost reviewers (Rob)
-Add Jernej as DE2 reviewer (Maxime)
-Add Chen-Yu as Allwinner maintainer (Maxime)
-staging: Make some stack arrays static const (Colin)
Core Changes:
-ttm: Allow drivers to specify their vma manager (to use gem mgr) (Gerd)
-docs: Various fixes in connector/encoder/bridge docs (Daniel, Lyude, Laurent)
-connector: Allow more than 3 possible encoders for a connector (José)
-dp_cec: Allow a connector to be associated with a cec device (Dariusz)
-various: Fix some compile/sparse warnings (Ville)
-mm: Ensure mm node removals are properly serialised (Chris)
-panel: Specify the type of panel for drm_panels for later use (Laurent)
-panel: Use drm_panel_init to init device and funcs (Laurent)
-mst: Refactors and cleanups in anticipation of suspend/resume support (Lyude)
-vram:
-Add lazy unmapping for gem bo's (Thomas)
-Unify and rationalize vram mm and gem vram (Thomas)
-Expose vmap and vunmap for gem vram objects (Thomas)
-Allow objects to be pinned at the top of vram to avoid fragmentation (Thomas)
Driver Changes:
-various: Include drm_bridge.h instead of relying on drm_crtc.h (Boris)
-ast/mgag200: Refactor show_cursor(), move cursor to top of video mem (Thomas)
-komeda:
-Add error event printing (behind CONFIG) and reg dump support (Lowry)
-Add suspend/resume support (Lowry)
-Workaround D71 shadow registers not flushing on disable (Lowry)
-meson: Add suspend/resume support (Neil)
-omap: Miscellaneous refactors and improvements (Tomi/Jyri)
-panfrost/shmem: Silence lockdep by using mutex_trylock (Rob)
-panfrost: Miscellaneous small fixes (Rob/Steven)
-sti: Fix warnings (Benjamin/Linus)
-sun4i:
-Add vcc-dsi regulator to sun6i_mipi_dsi (Jagan)
-A few patches to figure out the DRQ/start delay calc on dsi (Jagan/Icenowy)
-virtio:
-Add module param to switch resource reuse workaround on/off (Gerd)
-Avoid calling vmexit while holding spinlock (Gerd)
-Use gem shmem helpers instead of ttm (Gerd)
-Accommodate command buffer allocations too big for cma (David)
Cc: Rob Herring <robh@kernel.org>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Dariusz Marcinkiewicz <darekm@google.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Raymond Smith <raymond.smith@arm.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mihail Atanassov <Mihail.Atanassov@arm.com>
Cc: Lowry Li <Lowry.Li@arm.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Iago Toral Quiroga <itoral@igalia.com>
Cc: David Riley <davidriley@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
# gpg: Signature made Thu 10 Oct 2019 01:00:47 AM AEST
# gpg: using RSA key 732C002572DCAF79
# gpg: Can't check signature: public key not found
# Conflicts:
# drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
# drivers/gpu/drm/i915/i915_drv.c
# drivers/gpu/drm/i915/i915_gem.c
# drivers/gpu/drm/i915/i915_gem_gtt.c
# drivers/gpu/drm/i915/i915_vma.c
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191009150825.GA227673@art_vandelay
This commit is contained in:
Dave Airlie
@@ -156,6 +156,7 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);
|
||||
|
||||
void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate);
|
||||
void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt);
|
||||
void dw_hdmi_set_channel_status(struct dw_hdmi *hdmi, u8 *channel_status);
|
||||
void dw_hdmi_set_channel_allocation(struct dw_hdmi *hdmi, unsigned int ca);
|
||||
void dw_hdmi_audio_enable(struct dw_hdmi *hdmi);
|
||||
void dw_hdmi_audio_disable(struct dw_hdmi *hdmi);
|
||||
|
||||
+18
-15
@@ -42,7 +42,7 @@ struct drm_bridge_funcs {
|
||||
* This callback is invoked whenever our bridge is being attached to a
|
||||
* &drm_encoder.
|
||||
*
|
||||
* The attach callback is optional.
|
||||
* The @attach callback is optional.
|
||||
*
|
||||
* RETURNS:
|
||||
*
|
||||
@@ -56,7 +56,7 @@ struct drm_bridge_funcs {
|
||||
* This callback is invoked whenever our bridge is being detached from a
|
||||
* &drm_encoder.
|
||||
*
|
||||
* The detach callback is optional.
|
||||
* The @detach callback is optional.
|
||||
*/
|
||||
void (*detach)(struct drm_bridge *bridge);
|
||||
|
||||
@@ -76,7 +76,7 @@ struct drm_bridge_funcs {
|
||||
* atomic helpers to validate modes supplied by userspace in
|
||||
* drm_atomic_helper_check_modeset().
|
||||
*
|
||||
* This function is optional.
|
||||
* The @mode_valid callback is optional.
|
||||
*
|
||||
* NOTE:
|
||||
*
|
||||
@@ -108,7 +108,7 @@ struct drm_bridge_funcs {
|
||||
* this function passes all other callbacks must succeed for this
|
||||
* configuration.
|
||||
*
|
||||
* The mode_fixup callback is optional.
|
||||
* The @mode_fixup callback is optional.
|
||||
*
|
||||
* NOTE:
|
||||
*
|
||||
@@ -146,7 +146,7 @@ struct drm_bridge_funcs {
|
||||
* The bridge can assume that the display pipe (i.e. clocks and timing
|
||||
* signals) feeding it is still running when this callback is called.
|
||||
*
|
||||
* The disable callback is optional.
|
||||
* The @disable callback is optional.
|
||||
*/
|
||||
void (*disable)(struct drm_bridge *bridge);
|
||||
|
||||
@@ -165,7 +165,7 @@ struct drm_bridge_funcs {
|
||||
* singals) feeding it is no longer running when this callback is
|
||||
* called.
|
||||
*
|
||||
* The post_disable callback is optional.
|
||||
* The @post_disable callback is optional.
|
||||
*/
|
||||
void (*post_disable)(struct drm_bridge *bridge);
|
||||
|
||||
@@ -214,7 +214,7 @@ struct drm_bridge_funcs {
|
||||
* not enable the display link feeding the next bridge in the chain (if
|
||||
* there is one) when this callback is called.
|
||||
*
|
||||
* The pre_enable callback is optional.
|
||||
* The @pre_enable callback is optional.
|
||||
*/
|
||||
void (*pre_enable)(struct drm_bridge *bridge);
|
||||
|
||||
@@ -234,7 +234,7 @@ struct drm_bridge_funcs {
|
||||
* callback must enable the display link feeding the next bridge in the
|
||||
* chain if there is one.
|
||||
*
|
||||
* The enable callback is optional.
|
||||
* The @enable callback is optional.
|
||||
*/
|
||||
void (*enable)(struct drm_bridge *bridge);
|
||||
|
||||
@@ -283,7 +283,7 @@ struct drm_bridge_funcs {
|
||||
* would be prudent to also provide an implementation of @enable if
|
||||
* you are expecting driver calls into &drm_bridge_enable.
|
||||
*
|
||||
* The enable callback is optional.
|
||||
* The @atomic_enable callback is optional.
|
||||
*/
|
||||
void (*atomic_enable)(struct drm_bridge *bridge,
|
||||
struct drm_atomic_state *state);
|
||||
@@ -305,7 +305,7 @@ struct drm_bridge_funcs {
|
||||
* would be prudent to also provide an implementation of @disable if
|
||||
* you are expecting driver calls into &drm_bridge_disable.
|
||||
*
|
||||
* The disable callback is optional.
|
||||
* The @atomic_disable callback is optional.
|
||||
*/
|
||||
void (*atomic_disable)(struct drm_bridge *bridge,
|
||||
struct drm_atomic_state *state);
|
||||
@@ -330,7 +330,7 @@ struct drm_bridge_funcs {
|
||||
* @post_disable if you are expecting driver calls into
|
||||
* &drm_bridge_post_disable.
|
||||
*
|
||||
* The post_disable callback is optional.
|
||||
* The @atomic_post_disable callback is optional.
|
||||
*/
|
||||
void (*atomic_post_disable)(struct drm_bridge *bridge,
|
||||
struct drm_atomic_state *state);
|
||||
@@ -429,12 +429,15 @@ void drm_atomic_bridge_enable(struct drm_bridge *bridge,
|
||||
struct drm_atomic_state *state);
|
||||
|
||||
#ifdef CONFIG_DRM_PANEL_BRIDGE
|
||||
struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel,
|
||||
u32 connector_type);
|
||||
struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel);
|
||||
struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel,
|
||||
u32 connector_type);
|
||||
void drm_panel_bridge_remove(struct drm_bridge *bridge);
|
||||
struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev,
|
||||
struct drm_panel *panel,
|
||||
u32 connector_type);
|
||||
struct drm_panel *panel);
|
||||
struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
|
||||
struct drm_panel *panel,
|
||||
u32 connector_type);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
+13
-12
@@ -281,6 +281,10 @@ enum drm_panel_orientation {
|
||||
/* Additional Colorimetry extension added as part of CTA 861.G */
|
||||
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 11
|
||||
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER 12
|
||||
/* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */
|
||||
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED 13
|
||||
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT 14
|
||||
#define DRM_MODE_COLORIMETRY_BT601_YCC 15
|
||||
|
||||
/**
|
||||
* enum drm_bus_flags - bus_flags info for &drm_display_info
|
||||
@@ -1288,12 +1292,12 @@ struct drm_connector {
|
||||
/** @override_edid: has the EDID been overwritten through debugfs for testing? */
|
||||
bool override_edid;
|
||||
|
||||
#define DRM_CONNECTOR_MAX_ENCODER 3
|
||||
/**
|
||||
* @encoder_ids: Valid encoders for this connector. Please only use
|
||||
* drm_connector_for_each_possible_encoder() to enumerate these.
|
||||
* @possible_encoders: Bit mask of encoders that can drive this
|
||||
* connector, drm_encoder_index() determines the index into the bitfield
|
||||
* and the bits are set with drm_connector_attach_encoder().
|
||||
*/
|
||||
uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
|
||||
u32 possible_encoders;
|
||||
|
||||
/**
|
||||
* @encoder: Currently bound encoder driving this connector, if any.
|
||||
@@ -1523,7 +1527,8 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector,
|
||||
int drm_connector_attach_vrr_capable_property(
|
||||
struct drm_connector *connector);
|
||||
int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
|
||||
int drm_mode_create_colorspace_property(struct drm_connector *connector);
|
||||
int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector);
|
||||
int drm_mode_create_dp_colorspace_property(struct drm_connector *connector);
|
||||
int drm_mode_create_content_type_property(struct drm_device *dev);
|
||||
void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
|
||||
const struct drm_connector_state *conn_state);
|
||||
@@ -1608,13 +1613,9 @@ bool drm_connector_has_possible_encoder(struct drm_connector *connector,
|
||||
* drm_connector_for_each_possible_encoder - iterate connector's possible encoders
|
||||
* @connector: &struct drm_connector pointer
|
||||
* @encoder: &struct drm_encoder pointer used as cursor
|
||||
* @__i: int iteration cursor, for macro-internal use
|
||||
*/
|
||||
#define drm_connector_for_each_possible_encoder(connector, encoder, __i) \
|
||||
for ((__i) = 0; (__i) < ARRAY_SIZE((connector)->encoder_ids) && \
|
||||
(connector)->encoder_ids[(__i)] != 0; (__i)++) \
|
||||
for_each_if((encoder) = \
|
||||
drm_encoder_find((connector)->dev, NULL, \
|
||||
(connector)->encoder_ids[(__i)])) \
|
||||
#define drm_connector_for_each_possible_encoder(connector, encoder) \
|
||||
drm_for_each_encoder_mask(encoder, (connector)->dev, \
|
||||
(connector)->possible_encoders)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <drm/drm_connector.h>
|
||||
#include <drm/drm_device.h>
|
||||
#include <drm/drm_property.h>
|
||||
#include <drm/drm_bridge.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_plane.h>
|
||||
#include <drm/drm_blend.h>
|
||||
|
||||
@@ -42,6 +42,48 @@
|
||||
* 1.2 formally includes both eDP and DPI definitions.
|
||||
*/
|
||||
|
||||
/* MSA (Main Stream Attribute) MISC bits (as MISC1<<8|MISC0) */
|
||||
#define DP_MSA_MISC_SYNC_CLOCK (1 << 0)
|
||||
#define DP_MSA_MISC_INTERLACE_VTOTAL_EVEN (1 << 8)
|
||||
#define DP_MSA_MISC_STEREO_NO_3D (0 << 9)
|
||||
#define DP_MSA_MISC_STEREO_PROG_RIGHT_EYE (1 << 9)
|
||||
#define DP_MSA_MISC_STEREO_PROG_LEFT_EYE (3 << 9)
|
||||
/* bits per component for non-RAW */
|
||||
#define DP_MSA_MISC_6_BPC (0 << 5)
|
||||
#define DP_MSA_MISC_8_BPC (1 << 5)
|
||||
#define DP_MSA_MISC_10_BPC (2 << 5)
|
||||
#define DP_MSA_MISC_12_BPC (3 << 5)
|
||||
#define DP_MSA_MISC_16_BPC (4 << 5)
|
||||
/* bits per component for RAW */
|
||||
#define DP_MSA_MISC_RAW_6_BPC (1 << 5)
|
||||
#define DP_MSA_MISC_RAW_7_BPC (2 << 5)
|
||||
#define DP_MSA_MISC_RAW_8_BPC (3 << 5)
|
||||
#define DP_MSA_MISC_RAW_10_BPC (4 << 5)
|
||||
#define DP_MSA_MISC_RAW_12_BPC (5 << 5)
|
||||
#define DP_MSA_MISC_RAW_14_BPC (6 << 5)
|
||||
#define DP_MSA_MISC_RAW_16_BPC (7 << 5)
|
||||
/* pixel encoding/colorimetry format */
|
||||
#define _DP_MSA_MISC_COLOR(misc1_7, misc0_21, misc0_3, misc0_4) \
|
||||
((misc1_7) << 15 | (misc0_4) << 4 | (misc0_3) << 3 | ((misc0_21) << 1))
|
||||
#define DP_MSA_MISC_COLOR_RGB _DP_MSA_MISC_COLOR(0, 0, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_CEA_RGB _DP_MSA_MISC_COLOR(0, 0, 1, 0)
|
||||
#define DP_MSA_MISC_COLOR_RGB_WIDE_FIXED _DP_MSA_MISC_COLOR(0, 3, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_RGB_WIDE_FLOAT _DP_MSA_MISC_COLOR(0, 3, 0, 1)
|
||||
#define DP_MSA_MISC_COLOR_Y_ONLY _DP_MSA_MISC_COLOR(1, 0, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_RAW _DP_MSA_MISC_COLOR(1, 1, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_YCBCR_422_BT601 _DP_MSA_MISC_COLOR(0, 1, 1, 0)
|
||||
#define DP_MSA_MISC_COLOR_YCBCR_422_BT709 _DP_MSA_MISC_COLOR(0, 1, 1, 1)
|
||||
#define DP_MSA_MISC_COLOR_YCBCR_444_BT601 _DP_MSA_MISC_COLOR(0, 2, 1, 0)
|
||||
#define DP_MSA_MISC_COLOR_YCBCR_444_BT709 _DP_MSA_MISC_COLOR(0, 2, 1, 1)
|
||||
#define DP_MSA_MISC_COLOR_XVYCC_422_BT601 _DP_MSA_MISC_COLOR(0, 1, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_XVYCC_422_BT709 _DP_MSA_MISC_COLOR(0, 1, 0, 1)
|
||||
#define DP_MSA_MISC_COLOR_XVYCC_444_BT601 _DP_MSA_MISC_COLOR(0, 2, 0, 0)
|
||||
#define DP_MSA_MISC_COLOR_XVYCC_444_BT709 _DP_MSA_MISC_COLOR(0, 2, 0, 1)
|
||||
#define DP_MSA_MISC_COLOR_OPRGB _DP_MSA_MISC_COLOR(0, 0, 1, 1)
|
||||
#define DP_MSA_MISC_COLOR_DCI_P3 _DP_MSA_MISC_COLOR(0, 3, 1, 0)
|
||||
#define DP_MSA_MISC_COLOR_COLOR_PROFILE _DP_MSA_MISC_COLOR(0, 3, 1, 1)
|
||||
#define DP_MSA_MISC_COLOR_VSC_SDP (1 << 14)
|
||||
|
||||
#define DP_AUX_MAX_PAYLOAD_BYTES 16
|
||||
|
||||
#define DP_AUX_I2C_WRITE 0x0
|
||||
@@ -1230,20 +1272,19 @@ struct drm_dp_aux_msg {
|
||||
|
||||
struct cec_adapter;
|
||||
struct edid;
|
||||
struct drm_connector;
|
||||
|
||||
/**
|
||||
* struct drm_dp_aux_cec - DisplayPort CEC-Tunneling-over-AUX
|
||||
* @lock: mutex protecting this struct
|
||||
* @adap: the CEC adapter for CEC-Tunneling-over-AUX support.
|
||||
* @name: name of the CEC adapter
|
||||
* @parent: parent device of the CEC adapter
|
||||
* @connector: the connector this CEC adapter is associated with
|
||||
* @unregister_work: unregister the CEC adapter
|
||||
*/
|
||||
struct drm_dp_aux_cec {
|
||||
struct mutex lock;
|
||||
struct cec_adapter *adap;
|
||||
const char *name;
|
||||
struct device *parent;
|
||||
struct drm_connector *connector;
|
||||
struct delayed_work unregister_work;
|
||||
};
|
||||
|
||||
@@ -1451,8 +1492,8 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
|
||||
|
||||
#ifdef CONFIG_DRM_DP_CEC
|
||||
void drm_dp_cec_irq(struct drm_dp_aux *aux);
|
||||
void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name,
|
||||
struct device *parent);
|
||||
void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
|
||||
struct drm_connector *connector);
|
||||
void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux);
|
||||
void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid);
|
||||
void drm_dp_cec_unset_edid(struct drm_dp_aux *aux);
|
||||
@@ -1461,9 +1502,9 @@ static inline void drm_dp_cec_irq(struct drm_dp_aux *aux)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
|
||||
const char *name,
|
||||
struct device *parent)
|
||||
static inline void
|
||||
drm_dp_cec_register_connector(struct drm_dp_aux *aux,
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -287,7 +287,7 @@ struct drm_dp_remote_dpcd_write {
|
||||
struct drm_dp_remote_i2c_read {
|
||||
u8 num_transactions;
|
||||
u8 port_number;
|
||||
struct {
|
||||
struct drm_dp_remote_i2c_read_tx {
|
||||
u8 i2c_dev_id;
|
||||
u8 num_bytes;
|
||||
u8 *bytes;
|
||||
@@ -334,7 +334,7 @@ struct drm_dp_resource_status_notify {
|
||||
|
||||
struct drm_dp_query_payload_ack_reply {
|
||||
u8 port_number;
|
||||
u8 allocated_pbn;
|
||||
u16 allocated_pbn;
|
||||
};
|
||||
|
||||
struct drm_dp_sideband_msg_req_body {
|
||||
@@ -481,15 +481,11 @@ struct drm_dp_mst_topology_mgr {
|
||||
int conn_base_id;
|
||||
|
||||
/**
|
||||
* @down_rep_recv: Message receiver state for down replies. This and
|
||||
* @up_req_recv are only ever access from the work item, which is
|
||||
* serialised.
|
||||
* @down_rep_recv: Message receiver state for down replies.
|
||||
*/
|
||||
struct drm_dp_sideband_msg_rx down_rep_recv;
|
||||
/**
|
||||
* @up_req_recv: Message receiver state for up requests. This and
|
||||
* @down_rep_recv are only ever access from the work item, which is
|
||||
* serialised.
|
||||
* @up_req_recv: Message receiver state for up requests.
|
||||
*/
|
||||
struct drm_dp_sideband_msg_rx up_req_recv;
|
||||
|
||||
|
||||
@@ -778,8 +778,6 @@ struct drm_driver {
|
||||
int dev_priv_size;
|
||||
};
|
||||
|
||||
extern unsigned int drm_debug;
|
||||
|
||||
int drm_dev_init(struct drm_device *dev,
|
||||
struct drm_driver *driver,
|
||||
struct device *parent);
|
||||
|
||||
@@ -140,7 +140,7 @@ struct drm_encoder {
|
||||
* @possible_crtcs: Bitmask of potential CRTC bindings, using
|
||||
* drm_crtc_index() as the index into the bitfield. The driver must set
|
||||
* the bits for all &drm_crtc objects this encoder can be connected to
|
||||
* before calling drm_encoder_init().
|
||||
* before calling drm_dev_register().
|
||||
*
|
||||
* In reality almost every driver gets this wrong.
|
||||
*
|
||||
@@ -154,7 +154,7 @@ struct drm_encoder {
|
||||
* using drm_encoder_index() as the index into the bitfield. The driver
|
||||
* must set the bits for all &drm_encoder objects which can clone a
|
||||
* &drm_crtc together with this encoder before calling
|
||||
* drm_encoder_init(). Drivers should set the bit representing the
|
||||
* drm_dev_register(). Drivers should set the bit representing the
|
||||
* encoder itself, too. Cloning bits should be set such that when two
|
||||
* encoders can be used in a cloned configuration, they both should have
|
||||
* each another bits set.
|
||||
@@ -198,7 +198,7 @@ static inline unsigned int drm_encoder_index(const struct drm_encoder *encoder)
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_encoder_mask - find the mask of a registered ENCODER
|
||||
* drm_encoder_mask - find the mask of a registered encoder
|
||||
* @encoder: encoder to find mask for
|
||||
*
|
||||
* Given a registered encoder, return the mask bit of that encoder for an
|
||||
|
||||
@@ -539,18 +539,16 @@ drm_fb_helper_remove_conflicting_framebuffers(struct apertures_struct *a,
|
||||
/**
|
||||
* drm_fb_helper_remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices
|
||||
* @pdev: PCI device
|
||||
* @resource_id: index of PCI BAR configuring framebuffer memory
|
||||
* @name: requesting driver name
|
||||
*
|
||||
* This function removes framebuffer devices (eg. initialized by firmware)
|
||||
* using memory range configured for @pdev's BAR @resource_id.
|
||||
* using memory range configured for any of @pdev's memory bars.
|
||||
*
|
||||
* The function assumes that PCI device with shadowed ROM drives a primary
|
||||
* display and so kicks out vga16fb.
|
||||
*/
|
||||
static inline int
|
||||
drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
|
||||
int resource_id,
|
||||
const char *name)
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -560,7 +558,7 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
|
||||
* otherwise the vga fbdev driver falls over.
|
||||
*/
|
||||
#if IS_REACHABLE(CONFIG_FB)
|
||||
ret = remove_conflicting_pci_framebuffers(pdev, resource_id, name);
|
||||
ret = remove_conflicting_pci_framebuffers(pdev, name);
|
||||
#endif
|
||||
if (ret == 0)
|
||||
ret = vga_remove_vgacon(pdev);
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#ifndef DRM_GEM_TTM_HELPER_H
|
||||
#define DRM_GEM_TTM_HELPER_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
#include <drm/drm_gem.h>
|
||||
#include <drm/drm_device.h>
|
||||
#include <drm/ttm/ttm_bo_api.h>
|
||||
#include <drm/ttm/ttm_bo_driver.h>
|
||||
|
||||
#define drm_gem_ttm_of_gem(gem_obj) \
|
||||
container_of(gem_obj, struct ttm_buffer_object, base)
|
||||
|
||||
void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,
|
||||
const struct drm_gem_object *gem);
|
||||
|
||||
#endif
|
||||
@@ -3,9 +3,13 @@
|
||||
#ifndef DRM_GEM_VRAM_HELPER_H
|
||||
#define DRM_GEM_VRAM_HELPER_H
|
||||
|
||||
#include <drm/drm_file.h>
|
||||
#include <drm/drm_gem.h>
|
||||
#include <drm/drm_ioctl.h>
|
||||
#include <drm/ttm/ttm_bo_api.h>
|
||||
#include <drm/ttm/ttm_bo_driver.h>
|
||||
#include <drm/ttm/ttm_placement.h>
|
||||
|
||||
#include <linux/kernel.h> /* for container_of() */
|
||||
|
||||
struct drm_mode_create_dumb;
|
||||
@@ -15,6 +19,7 @@ struct vm_area_struct;
|
||||
|
||||
#define DRM_GEM_VRAM_PL_FLAG_VRAM TTM_PL_FLAG_VRAM
|
||||
#define DRM_GEM_VRAM_PL_FLAG_SYSTEM TTM_PL_FLAG_SYSTEM
|
||||
#define DRM_GEM_VRAM_PL_FLAG_TOPDOWN TTM_PL_FLAG_TOPDOWN
|
||||
|
||||
/*
|
||||
* Buffer-object helpers
|
||||
@@ -34,11 +39,26 @@ struct vm_area_struct;
|
||||
* backed by VRAM. It can be used for simple framebuffer devices with
|
||||
* dedicated memory. The buffer object can be evicted to system memory if
|
||||
* video memory becomes scarce.
|
||||
*
|
||||
* GEM VRAM objects perform reference counting for pin and mapping
|
||||
* operations. So a buffer object that has been pinned N times with
|
||||
* drm_gem_vram_pin() must be unpinned N times with
|
||||
* drm_gem_vram_unpin(). The same applies to pairs of
|
||||
* drm_gem_vram_kmap() and drm_gem_vram_kunmap(), as well as pairs of
|
||||
* drm_gem_vram_vmap() and drm_gem_vram_vunmap().
|
||||
*/
|
||||
struct drm_gem_vram_object {
|
||||
struct ttm_buffer_object bo;
|
||||
struct ttm_bo_kmap_obj kmap;
|
||||
|
||||
/**
|
||||
* @kmap_use_count:
|
||||
*
|
||||
* Reference count on the virtual address.
|
||||
* The address are un-mapped when the count reaches zero.
|
||||
*/
|
||||
unsigned int kmap_use_count;
|
||||
|
||||
/* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */
|
||||
struct ttm_placement placement;
|
||||
struct ttm_place placements[2];
|
||||
@@ -83,6 +103,8 @@ int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);
|
||||
void *drm_gem_vram_kmap(struct drm_gem_vram_object *gbo, bool map,
|
||||
bool *is_iomem);
|
||||
void drm_gem_vram_kunmap(struct drm_gem_vram_object *gbo);
|
||||
void *drm_gem_vram_vmap(struct drm_gem_vram_object *gbo);
|
||||
void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo, void *vaddr);
|
||||
|
||||
int drm_gem_vram_fill_create_dumb(struct drm_file *file,
|
||||
struct drm_device *dev,
|
||||
@@ -91,18 +113,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
|
||||
bool interruptible,
|
||||
struct drm_mode_create_dumb *args);
|
||||
|
||||
/*
|
||||
* Helpers for struct ttm_bo_driver
|
||||
*/
|
||||
|
||||
void drm_gem_vram_bo_driver_evict_flags(struct ttm_buffer_object *bo,
|
||||
struct ttm_placement *pl);
|
||||
|
||||
int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo,
|
||||
struct file *filp);
|
||||
|
||||
extern const struct drm_vram_mm_funcs drm_gem_vram_mm_funcs;
|
||||
|
||||
/*
|
||||
* Helpers for struct drm_driver
|
||||
*/
|
||||
@@ -122,8 +132,81 @@ int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,
|
||||
* &struct drm_driver with default functions.
|
||||
*/
|
||||
#define DRM_GEM_VRAM_DRIVER \
|
||||
.debugfs_init = drm_vram_mm_debugfs_init, \
|
||||
.dumb_create = drm_gem_vram_driver_dumb_create, \
|
||||
.dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, \
|
||||
.gem_prime_mmap = drm_gem_prime_mmap
|
||||
|
||||
/*
|
||||
* VRAM memory manager
|
||||
*/
|
||||
|
||||
/**
|
||||
* struct drm_vram_mm - An instance of VRAM MM
|
||||
* @vram_base: Base address of the managed video memory
|
||||
* @vram_size: Size of the managed video memory in bytes
|
||||
* @bdev: The TTM BO device.
|
||||
* @funcs: TTM BO functions
|
||||
*
|
||||
* The fields &struct drm_vram_mm.vram_base and
|
||||
* &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are
|
||||
* available for public read access. Use the field
|
||||
* &struct drm_vram_mm.bdev to access the TTM BO device.
|
||||
*/
|
||||
struct drm_vram_mm {
|
||||
uint64_t vram_base;
|
||||
size_t vram_size;
|
||||
|
||||
struct ttm_bo_device bdev;
|
||||
};
|
||||
|
||||
/**
|
||||
* drm_vram_mm_of_bdev() - \
|
||||
Returns the container of type &struct ttm_bo_device for field bdev.
|
||||
* @bdev: the TTM BO device
|
||||
*
|
||||
* Returns:
|
||||
* The containing instance of &struct drm_vram_mm
|
||||
*/
|
||||
static inline struct drm_vram_mm *drm_vram_mm_of_bdev(
|
||||
struct ttm_bo_device *bdev)
|
||||
{
|
||||
return container_of(bdev, struct drm_vram_mm, bdev);
|
||||
}
|
||||
|
||||
int drm_vram_mm_debugfs_init(struct drm_minor *minor);
|
||||
|
||||
/*
|
||||
* Helpers for integration with struct drm_device
|
||||
*/
|
||||
|
||||
struct drm_vram_mm *drm_vram_helper_alloc_mm(
|
||||
struct drm_device *dev, uint64_t vram_base, size_t vram_size);
|
||||
void drm_vram_helper_release_mm(struct drm_device *dev);
|
||||
|
||||
/*
|
||||
* Helpers for &struct file_operations
|
||||
*/
|
||||
|
||||
int drm_vram_mm_file_operations_mmap(
|
||||
struct file *filp, struct vm_area_struct *vma);
|
||||
|
||||
/**
|
||||
* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \
|
||||
&struct file_operations
|
||||
*
|
||||
* Drivers that use VRAM MM can use this macro to initialize
|
||||
* &struct file_operations with default functions.
|
||||
*/
|
||||
#define DRM_VRAM_MM_FILE_OPERATIONS \
|
||||
.llseek = no_llseek, \
|
||||
.read = drm_read, \
|
||||
.poll = drm_poll, \
|
||||
.unlocked_ioctl = drm_ioctl, \
|
||||
.compat_ioctl = drm_compat_ioctl, \
|
||||
.mmap = drm_vram_mm_file_operations_mmap, \
|
||||
.open = drm_open, \
|
||||
.release = drm_release \
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -168,8 +168,9 @@ struct drm_mm_node {
|
||||
struct rb_node rb_hole_addr;
|
||||
u64 __subtree_last;
|
||||
u64 hole_size;
|
||||
bool allocated : 1;
|
||||
bool scanned_block : 1;
|
||||
unsigned long flags;
|
||||
#define DRM_MM_NODE_ALLOCATED_BIT 0
|
||||
#define DRM_MM_NODE_SCANNED_BIT 1
|
||||
#ifdef CONFIG_DRM_DEBUG_MM
|
||||
depot_stack_handle_t stack;
|
||||
#endif
|
||||
@@ -253,7 +254,7 @@ struct drm_mm_scan {
|
||||
*/
|
||||
static inline bool drm_mm_node_allocated(const struct drm_mm_node *node)
|
||||
{
|
||||
return node->allocated;
|
||||
return test_bit(DRM_MM_NODE_ALLOCATED_BIT, &node->flags);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -955,9 +955,8 @@ struct drm_connector_helper_funcs {
|
||||
* @atomic_best_encoder.
|
||||
*
|
||||
* You can leave this function to NULL if the connector is only
|
||||
* attached to a single encoder and you are using the atomic helpers.
|
||||
* In this case, the core will call drm_atomic_helper_best_encoder()
|
||||
* for you.
|
||||
* attached to a single encoder. In this case, the core will call
|
||||
* drm_connector_get_single_encoder() for you.
|
||||
*
|
||||
* RETURNS:
|
||||
*
|
||||
@@ -977,7 +976,7 @@ struct drm_connector_helper_funcs {
|
||||
*
|
||||
* This function is used by drm_atomic_helper_check_modeset().
|
||||
* If it is not implemented, the core will fallback to @best_encoder
|
||||
* (or drm_atomic_helper_best_encoder() if @best_encoder is NULL).
|
||||
* (or drm_connector_get_single_encoder() if @best_encoder is NULL).
|
||||
*
|
||||
* NOTE:
|
||||
*
|
||||
|
||||
@@ -114,6 +114,15 @@ static inline bool drm_modeset_is_locked(struct drm_modeset_lock *lock)
|
||||
return ww_mutex_is_locked(&lock->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_modeset_lock_assert_held - equivalent to lockdep_assert_held()
|
||||
* @lock: lock to check
|
||||
*/
|
||||
static inline void drm_modeset_lock_assert_held(struct drm_modeset_lock *lock)
|
||||
{
|
||||
lockdep_assert_held(&lock->mutex.base);
|
||||
}
|
||||
|
||||
int drm_modeset_lock(struct drm_modeset_lock *lock,
|
||||
struct drm_modeset_acquire_ctx *ctx);
|
||||
int __must_check drm_modeset_lock_single_interruptible(struct drm_modeset_lock *lock);
|
||||
|
||||
+12
-1
@@ -139,6 +139,15 @@ struct drm_panel {
|
||||
*/
|
||||
const struct drm_panel_funcs *funcs;
|
||||
|
||||
/**
|
||||
* @connector_type:
|
||||
*
|
||||
* Type of the panel as a DRM_MODE_CONNECTOR_* value. This is used to
|
||||
* initialise the drm_connector corresponding to the panel with the
|
||||
* correct connector type.
|
||||
*/
|
||||
int connector_type;
|
||||
|
||||
/**
|
||||
* @list:
|
||||
*
|
||||
@@ -147,7 +156,9 @@ struct drm_panel {
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
void drm_panel_init(struct drm_panel *panel);
|
||||
void drm_panel_init(struct drm_panel *panel, struct device *dev,
|
||||
const struct drm_panel_funcs *funcs,
|
||||
int connector_type);
|
||||
|
||||
int drm_panel_add(struct drm_panel *panel);
|
||||
void drm_panel_remove(struct drm_panel *panel);
|
||||
|
||||
@@ -61,8 +61,6 @@ struct drm_device;
|
||||
struct drm_gem_object;
|
||||
struct drm_file;
|
||||
|
||||
struct device;
|
||||
|
||||
/* core prime functions */
|
||||
struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,
|
||||
struct dma_buf_export_info *exp_info);
|
||||
|
||||
@@ -34,6 +34,8 @@
|
||||
|
||||
#include <drm/drm.h>
|
||||
|
||||
extern unsigned int drm_debug;
|
||||
|
||||
/**
|
||||
* DOC: print
|
||||
*
|
||||
@@ -83,11 +85,14 @@ void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
|
||||
void __drm_puts_seq_file(struct drm_printer *p, const char *str);
|
||||
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
|
||||
void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf);
|
||||
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
|
||||
|
||||
__printf(2, 3)
|
||||
void drm_printf(struct drm_printer *p, const char *f, ...);
|
||||
void drm_puts(struct drm_printer *p, const char *str);
|
||||
void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset);
|
||||
void drm_print_bits(struct drm_printer *p, unsigned long value,
|
||||
const char * const bits[], unsigned int nbits);
|
||||
|
||||
__printf(2, 0)
|
||||
/**
|
||||
@@ -227,6 +232,22 @@ static inline struct drm_printer drm_debug_printer(const char *prefix)
|
||||
return p;
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_err_printer - construct a &drm_printer that outputs to pr_err()
|
||||
* @prefix: debug output prefix
|
||||
*
|
||||
* RETURNS:
|
||||
* The &drm_printer object
|
||||
*/
|
||||
static inline struct drm_printer drm_err_printer(const char *prefix)
|
||||
{
|
||||
struct drm_printer p = {
|
||||
.printfn = __drm_printfn_err,
|
||||
.prefix = prefix
|
||||
};
|
||||
return p;
|
||||
}
|
||||
|
||||
/*
|
||||
* The following categories are defined:
|
||||
*
|
||||
@@ -272,6 +293,11 @@ static inline struct drm_printer drm_debug_printer(const char *prefix)
|
||||
#define DRM_UT_LEASE 0x80
|
||||
#define DRM_UT_DP 0x100
|
||||
|
||||
static inline bool drm_debug_enabled(unsigned int category)
|
||||
{
|
||||
return unlikely(drm_debug & category);
|
||||
}
|
||||
|
||||
__printf(3, 4)
|
||||
void drm_dev_printk(const struct device *dev, const char *level,
|
||||
const char *format, ...);
|
||||
|
||||
@@ -69,6 +69,23 @@ struct drm_rect {
|
||||
(r)->x1 >> 16, (((r)->x1 & 0xffff) * 15625) >> 10, \
|
||||
(r)->y1 >> 16, (((r)->y1 & 0xffff) * 15625) >> 10
|
||||
|
||||
/**
|
||||
* drm_rect_init - initialize the rectangle from x/y/w/h
|
||||
* @r: rectangle
|
||||
* @x: x coordinate
|
||||
* @y: y coordinate
|
||||
* @width: width
|
||||
* @height: height
|
||||
*/
|
||||
static inline void drm_rect_init(struct drm_rect *r, int x, int y,
|
||||
int width, int height)
|
||||
{
|
||||
r->x1 = x;
|
||||
r->y1 = y;
|
||||
r->x2 = x + width;
|
||||
r->y2 = y + height;
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_rect_adjust_size - adjust the size of the rectangle
|
||||
* @r: rectangle to be adjusted
|
||||
@@ -106,6 +123,20 @@ static inline void drm_rect_translate(struct drm_rect *r, int dx, int dy)
|
||||
r->y2 += dy;
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_rect_translate_to - translate the rectangle to an absolute position
|
||||
* @r: rectangle to be tranlated
|
||||
* @x: horizontal position
|
||||
* @y: vertical position
|
||||
*
|
||||
* Move rectangle @r to @x in the horizontal direction,
|
||||
* and to @y in the vertical direction.
|
||||
*/
|
||||
static inline void drm_rect_translate_to(struct drm_rect *r, int x, int y)
|
||||
{
|
||||
drm_rect_translate(r, x - r->x1, y - r->y1);
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_rect_downscale - downscale a rectangle
|
||||
* @r: rectangle to be downscaled
|
||||
|
||||
@@ -109,9 +109,20 @@ struct drm_vblank_crtc {
|
||||
seqlock_t seqlock;
|
||||
|
||||
/**
|
||||
* @count: Current software vblank counter.
|
||||
* @count:
|
||||
*
|
||||
* Current software vblank counter.
|
||||
*
|
||||
* Note that for a given vblank counter value drm_crtc_handle_vblank()
|
||||
* and drm_crtc_vblank_count() or drm_crtc_vblank_count_and_time()
|
||||
* provide a barrier: Any writes done before calling
|
||||
* drm_crtc_handle_vblank() will be visible to callers of the later
|
||||
* functions, iff the vblank count is the same or a later one.
|
||||
*
|
||||
* IMPORTANT: This guarantee requires barriers, therefor never access
|
||||
* this field directly. Use drm_crtc_vblank_count() instead.
|
||||
*/
|
||||
u64 count;
|
||||
atomic64_t count;
|
||||
/**
|
||||
* @time: Vblank timestamp corresponding to @count.
|
||||
*/
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#ifndef DRM_VRAM_MM_HELPER_H
|
||||
#define DRM_VRAM_MM_HELPER_H
|
||||
|
||||
#include <drm/drm_file.h>
|
||||
#include <drm/drm_ioctl.h>
|
||||
#include <drm/ttm/ttm_bo_driver.h>
|
||||
|
||||
struct drm_device;
|
||||
|
||||
/**
|
||||
* struct drm_vram_mm_funcs - Callback functions for &struct drm_vram_mm
|
||||
* @evict_flags: Provides an implementation for struct \
|
||||
&ttm_bo_driver.evict_flags
|
||||
* @verify_access: Provides an implementation for \
|
||||
struct &ttm_bo_driver.verify_access
|
||||
*
|
||||
* These callback function integrate VRAM MM with TTM buffer objects. New
|
||||
* functions can be added if necessary.
|
||||
*/
|
||||
struct drm_vram_mm_funcs {
|
||||
void (*evict_flags)(struct ttm_buffer_object *bo,
|
||||
struct ttm_placement *placement);
|
||||
int (*verify_access)(struct ttm_buffer_object *bo, struct file *filp);
|
||||
};
|
||||
|
||||
/**
|
||||
* struct drm_vram_mm - An instance of VRAM MM
|
||||
* @vram_base: Base address of the managed video memory
|
||||
* @vram_size: Size of the managed video memory in bytes
|
||||
* @bdev: The TTM BO device.
|
||||
* @funcs: TTM BO functions
|
||||
*
|
||||
* The fields &struct drm_vram_mm.vram_base and
|
||||
* &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are
|
||||
* available for public read access. Use the field
|
||||
* &struct drm_vram_mm.bdev to access the TTM BO device.
|
||||
*/
|
||||
struct drm_vram_mm {
|
||||
uint64_t vram_base;
|
||||
size_t vram_size;
|
||||
|
||||
struct ttm_bo_device bdev;
|
||||
|
||||
const struct drm_vram_mm_funcs *funcs;
|
||||
};
|
||||
|
||||
/**
|
||||
* drm_vram_mm_of_bdev() - \
|
||||
Returns the container of type &struct ttm_bo_device for field bdev.
|
||||
* @bdev: the TTM BO device
|
||||
*
|
||||
* Returns:
|
||||
* The containing instance of &struct drm_vram_mm
|
||||
*/
|
||||
static inline struct drm_vram_mm *drm_vram_mm_of_bdev(
|
||||
struct ttm_bo_device *bdev)
|
||||
{
|
||||
return container_of(bdev, struct drm_vram_mm, bdev);
|
||||
}
|
||||
|
||||
int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
|
||||
uint64_t vram_base, size_t vram_size,
|
||||
const struct drm_vram_mm_funcs *funcs);
|
||||
void drm_vram_mm_cleanup(struct drm_vram_mm *vmm);
|
||||
|
||||
int drm_vram_mm_mmap(struct file *filp, struct vm_area_struct *vma,
|
||||
struct drm_vram_mm *vmm);
|
||||
|
||||
/*
|
||||
* Helpers for integration with struct drm_device
|
||||
*/
|
||||
|
||||
struct drm_vram_mm *drm_vram_helper_alloc_mm(
|
||||
struct drm_device *dev, uint64_t vram_base, size_t vram_size,
|
||||
const struct drm_vram_mm_funcs *funcs);
|
||||
void drm_vram_helper_release_mm(struct drm_device *dev);
|
||||
|
||||
/*
|
||||
* Helpers for &struct file_operations
|
||||
*/
|
||||
|
||||
int drm_vram_mm_file_operations_mmap(
|
||||
struct file *filp, struct vm_area_struct *vma);
|
||||
|
||||
/**
|
||||
* define DRM_VRAM_MM_FILE_OPERATIONS - default callback functions for \
|
||||
&struct file_operations
|
||||
*
|
||||
* Drivers that use VRAM MM can use this macro to initialize
|
||||
* &struct file_operations with default functions.
|
||||
*/
|
||||
#define DRM_VRAM_MM_FILE_OPERATIONS \
|
||||
.llseek = no_llseek, \
|
||||
.read = drm_read, \
|
||||
.poll = drm_poll, \
|
||||
.unlocked_ioctl = drm_ioctl, \
|
||||
.compat_ioctl = drm_compat_ioctl, \
|
||||
.mmap = drm_vram_mm_file_operations_mmap, \
|
||||
.open = drm_open, \
|
||||
.release = drm_release \
|
||||
|
||||
#endif
|
||||
@@ -451,7 +451,7 @@ extern struct ttm_bo_global {
|
||||
*
|
||||
* @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
|
||||
* @man: An array of mem_type_managers.
|
||||
* @vma_manager: Address space manager
|
||||
* @vma_manager: Address space manager (pointer)
|
||||
* lru_lock: Spinlock that protects the buffer+device lru lists and
|
||||
* ddestroy lists.
|
||||
* @dev_mapping: A pointer to the struct address_space representing the
|
||||
@@ -474,7 +474,7 @@ struct ttm_bo_device {
|
||||
/*
|
||||
* Protected by internal locks.
|
||||
*/
|
||||
struct drm_vma_offset_manager vma_manager;
|
||||
struct drm_vma_offset_manager *vma_manager;
|
||||
|
||||
/*
|
||||
* Protected by the global:lru lock.
|
||||
@@ -595,6 +595,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev);
|
||||
* @glob: A pointer to an initialized struct ttm_bo_global.
|
||||
* @driver: A pointer to a struct ttm_bo_driver set up by the caller.
|
||||
* @mapping: The address space to use for this bo.
|
||||
* @vma_manager: A pointer to a vma manager.
|
||||
* @file_page_offset: Offset into the device address space that is available
|
||||
* for buffer data. This ensures compatibility with other users of the
|
||||
* address space.
|
||||
@@ -606,6 +607,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev);
|
||||
int ttm_bo_device_init(struct ttm_bo_device *bdev,
|
||||
struct ttm_bo_driver *driver,
|
||||
struct address_space *mapping,
|
||||
struct drm_vma_offset_manager *vma_manager,
|
||||
bool need_dma32);
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user