|
@@ -189,7 +189,7 @@ struct intel_overlay {
|
|
|
static struct overlay_registers __iomem *
|
|
|
intel_overlay_map_regs(struct intel_overlay *overlay)
|
|
|
{
|
|
|
- drm_i915_private_t *dev_priv = overlay->dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = overlay->dev->dev_private;
|
|
|
struct overlay_registers __iomem *regs;
|
|
|
|
|
|
if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
|
|
@@ -212,7 +212,7 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
|
|
|
void (*tail)(struct intel_overlay *))
|
|
|
{
|
|
|
struct drm_device *dev = overlay->dev;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_ring_buffer *ring = &dev_priv->ring[RCS];
|
|
|
int ret;
|
|
|
|
|
@@ -262,7 +262,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay,
|
|
|
bool load_polyphase_filter)
|
|
|
{
|
|
|
struct drm_device *dev = overlay->dev;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_ring_buffer *ring = &dev_priv->ring[RCS];
|
|
|
u32 flip_addr = overlay->flip_addr;
|
|
|
u32 tmp;
|
|
@@ -362,7 +362,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
|
|
|
static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
|
|
|
{
|
|
|
struct drm_device *dev = overlay->dev;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_ring_buffer *ring = &dev_priv->ring[RCS];
|
|
|
int ret;
|
|
|
|
|
@@ -388,7 +388,7 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
|
|
|
static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
|
|
|
{
|
|
|
struct drm_device *dev = overlay->dev;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_ring_buffer *ring = &dev_priv->ring[RCS];
|
|
|
int ret;
|
|
|
|
|
@@ -834,7 +834,7 @@ static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,
|
|
|
static void update_pfit_vscale_ratio(struct intel_overlay *overlay)
|
|
|
{
|
|
|
struct drm_device *dev = overlay->dev;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
u32 pfit_control = I915_READ(PFIT_CONTROL);
|
|
|
u32 ratio;
|
|
|
|
|
@@ -1026,7 +1026,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
|
|
|
struct drm_file *file_priv)
|
|
|
{
|
|
|
struct drm_intel_overlay_put_image *put_image_rec = data;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_overlay *overlay;
|
|
|
struct drm_mode_object *drmmode_obj;
|
|
|
struct intel_crtc *crtc;
|
|
@@ -1226,7 +1226,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
|
|
|
struct drm_file *file_priv)
|
|
|
{
|
|
|
struct drm_intel_overlay_attrs *attrs = data;
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_overlay *overlay;
|
|
|
struct overlay_registers __iomem *regs;
|
|
|
int ret;
|
|
@@ -1311,7 +1311,7 @@ out_unlock:
|
|
|
|
|
|
void intel_setup_overlay(struct drm_device *dev)
|
|
|
{
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_overlay *overlay;
|
|
|
struct drm_i915_gem_object *reg_bo;
|
|
|
struct overlay_registers __iomem *regs;
|
|
@@ -1397,7 +1397,7 @@ out_free:
|
|
|
|
|
|
void intel_cleanup_overlay(struct drm_device *dev)
|
|
|
{
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
|
|
if (!dev_priv->overlay)
|
|
|
return;
|
|
@@ -1421,7 +1421,7 @@ struct intel_overlay_error_state {
|
|
|
static struct overlay_registers __iomem *
|
|
|
intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
|
|
|
{
|
|
|
- drm_i915_private_t *dev_priv = overlay->dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = overlay->dev->dev_private;
|
|
|
struct overlay_registers __iomem *regs;
|
|
|
|
|
|
if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
|
|
@@ -1447,7 +1447,7 @@ static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay,
|
|
|
struct intel_overlay_error_state *
|
|
|
intel_overlay_capture_error_state(struct drm_device *dev)
|
|
|
{
|
|
|
- drm_i915_private_t *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
struct intel_overlay *overlay = dev_priv->overlay;
|
|
|
struct intel_overlay_error_state *error;
|
|
|
struct overlay_registers __iomem *regs;
|