WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_drv.h

 struct opregion_header;
 struct opregion_acpi;
 struct opregion_swsci;
+struct opregion_asle;
-struct opregion_asle;
+struct drm_i915_private;
 struct intel_opregion {
 	struct opregion_header *header;
 struct drm_i915_master_private {
 	drm_local_map_t *sarea;
 	struct _drm_i915_sarea *sarea_priv;
 };
 #define I915_FENCE_REG_NONE -1
+#define I915_MAX_NUM_FENCES 16
+/* 16 fences + sign bit for FENCE_REG_NONE */
+#define I915_MAX_NUM_FENCE_BITS 5
 struct drm_i915_fence_reg {
 	struct list_head lru_list;
 	struct drm_i915_gem_object *obj;
 	u8 initialized;
 	u8 dvo_port;
 	u8 slave_addr;
 	u8 dvo_wiring;
 	u8 i2c_pin;
-	u8 i2c_speed;
 	u8 ddc_pin;
 };
 	u32 instpm;
 	u32 instps;
 	u32 instdone1;
 	u32 seqno;
 	u64 bbaddr;
-	u64 fence[16];
+	u64 fence[I915_MAX_NUM_FENCES];
 	struct timeval time;
 	struct drm_i915_error_object {
 		int page_count;
 		u32 gtt_offset;
 		u32 *pages[0];
 		u32 name;
 		u32 seqno;
 		u32 gtt_offset;
 		u32 read_domains;
 		u32 write_domain;
-		s32 fence_reg:5;
+		s32 fence_reg:I915_MAX_NUM_FENCE_BITS;
 		s32 pinned:2;
 		u32 tiling:2;
 		u32 dirty:1;
 		u32 purgeable:1;
 		u32 ring:4;
 	void (*enable_fbc)(struct drm_crtc *crtc, unsigned long interval);
 	void (*disable_fbc)(struct drm_device *dev);
 	int (*get_display_clock_speed)(struct drm_device *dev);
 	int (*get_fifo_size)(struct drm_device *dev, int plane);
 	void (*update_wm)(struct drm_device *dev);
+	void (*update_sprite_wm)(struct drm_device *dev, int pipe,
+				 uint32_t sprite_width, int pixel_size);
 	int (*crtc_mode_set)(struct drm_crtc *crtc,
 			     struct drm_display_mode *mode,
 			     struct drm_display_mode *adjusted_mode,
 			     int x, int y,
 			     struct drm_framebuffer *old_fb);
+	void (*write_eld)(struct drm_connector *connector,
+			  struct drm_crtc *crtc);
 	void (*fdi_link_train)(struct drm_crtc *crtc);
 	void (*init_clock_gating)(struct drm_device *dev);
 	void (*init_pch_clock_gating)(struct drm_device *dev);
 	int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
 			  struct drm_framebuffer *fb,
 			  struct drm_i915_gem_object *obj);
 	int (*update_plane)(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 			    int x, int y);
+	void (*force_wake_get)(struct drm_i915_private *dev_priv);
+	void (*force_wake_put)(struct drm_i915_private *dev_priv);
 	/* clock updates for mode set */
 	/* cursor updates */
 	/* render clock increase/decrease */
 	/* display clock increase/decrease */
 	/* pll clock increase/decrease */
 	int has_gem;
 	int relative_constants_mode;
+	void __iomem *regs;
+	/** gt_fifo_count and the subsequent register write are synchronized
+	 * with dev->struct_mutex. */
+	unsigned gt_fifo_count;
+	/** forcewake_count is protected by gt_lock */
+	unsigned forcewake_count;
-	void __iomem *regs;
+	/** gt_lock is also taken in irq contexts. */
-	u32 gt_fifo_count;
+    spinlock_t gt_lock;
     struct intel_gmbus {
 	/* For hangcheck timer */
 #define DRM_I915_HANGCHECK_PERIOD 1500 /* in ms */
     struct timer_list hangcheck_timer;
 	int hangcheck_count;
 	uint32_t last_acthd;
+	uint32_t last_acthd_bsd;
+	uint32_t last_acthd_blt;
 	uint32_t last_instdone;
 	uint32_t last_instdone1;
 	unsigned long cfb_size;
     struct intel_opregion opregion;
+	/* overlay */
-	/* overlay */
+//   struct intel_overlay *overlay;
-//   struct intel_overlay *overlay;
+	bool sprite_scaling_enabled;
-	/* LVDS info */
-	int backlight_level;  /* restore backlight to this value */
+	/* LVDS info */
-	bool backlight_enabled;
+	int backlight_level;  /* restore backlight to this value */
-	struct drm_display_mode *panel_fixed_mode;
+	bool backlight_enabled;
 	struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
 	struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */
 	/* Feature bits from the VBIOS */
 	unsigned int int_tv_support:1;
+	unsigned int lvds_dither:1;
-	unsigned int lvds_dither:1;
+	unsigned int lvds_vbt:1;
-	unsigned int lvds_vbt:1;
+	unsigned int int_crt_support:1;
-	unsigned int int_crt_support:1;
+	unsigned int lvds_use_ssc:1;
-	unsigned int lvds_use_ssc:1;
+	unsigned int display_clock_mode:1;
 	int lvds_ssc_freq;
 	bool no_aux_handshake;
 //   struct notifier_block lid_notifier;
 	int crt_ddc_pin;
-    struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
+	struct drm_i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; /* assume 965 */
 	int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */
 	u8 saveGR[25];
 	u8 saveAR_INDEX;
 	u8 saveAR[21];
 	u8 saveDACMASK;
 	u8 saveCR[37];
-	uint64_t saveFENCE[16];
+	uint64_t saveFENCE[I915_MAX_NUM_FENCES];
 	u32 saveCURACNTR;
 	u32 saveCURAPOS;
 	u32 saveCURABASE;
 	u32 saveCURBCNTR;
 	u32 saveCURBPOS;
     struct sdvo_device_mapping sdvo_mappings[2];
 	/* indicate whether the LVDS_BORDER should be enabled or not */
 	unsigned int lvds_border_bits;
 	/* Panel fitter placement and size for Ironlake+ */
 	u32 pch_pf_pos, pch_pf_size;
-	int panel_t3, panel_t12;
-    struct drm_crtc *plane_to_crtc_mapping[2];
+    struct drm_crtc *plane_to_crtc_mapping[3];
-    struct drm_crtc *pipe_to_crtc_mapping[2];
+    struct drm_crtc *pipe_to_crtc_mapping[3];
 //   wait_queue_head_t pending_flip_queue;
 	bool flip_pending_is_done;
 	u8 fmax;
 	u8 fstart;
 	u64 last_count1;
+	unsigned long last_time1;
-	unsigned long last_time1;
+	unsigned long chipset_power;
 	u64 last_count2;
     struct timespec last_time2;
 	unsigned long gfx_power;
 	int c_m;
 //   struct backlight_device *backlight;
-//   struct drm_property *broadcast_rgb_property;
-//   struct drm_property *force_audio_property;
 //   struct drm_property *broadcast_rgb_property;
-	atomic_t forcewake_count;
+//   struct drm_property *force_audio_property;
 } drm_i915_private_t;
     /**
      * Fence register bits (if any) for this object.  Will be set
      * as needed when mapped into the GTT.
-     * Protected by dev->struct_mutex.
-     *
-     * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE)
+     * Protected by dev->struct_mutex.
      */
-    signed int fence_reg : 5;
+	signed int fence_reg:I915_MAX_NUM_FENCE_BITS;
     /**
      * Advice: are the backing pages purgeable?
 	struct list_head client_list;
 };
 struct drm_i915_file_private {
 	struct {
-//       struct spinlock lock;
+        spinlock_t lock;
 		struct list_head request_list;
 	} mm;
 };
+{
    drm_i915_private_t *dev_priv = ring->dev->dev_private;
    return ring->outstanding_lazy_request = dev_priv->next_seqno;
+}
+int __must_check i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
+					   struct intel_ring_buffer *pipelined);
 int __must_check i915_gem_object_put_fence(struct drm_i915_gem_object *obj);
 void i915_gem_retire_requests(struct drm_device *dev);
 void i915_gem_reset(struct drm_device *dev);
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_device *dev);
 extern void intel_teardown_gmbus(struct drm_device *dev);
 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
-//extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
+extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
-//{
+{
-//   return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
+	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
-//}
+}
 extern void intel_i2c_reset(struct drm_device *dev);
 /* intel_opregion.c */
 extern int intel_opregion_setup(struct drm_device *dev);
 extern void intel_modeset_cleanup(struct drm_device *dev);
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 extern bool intel_fbc_enabled(struct drm_device *dev);
 extern void intel_disable_fbc(struct drm_device *dev);
 extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
+extern void ironlake_init_pch_refclk(struct drm_device *dev);
 extern void ironlake_enable_rc6(struct drm_device *dev);
 extern void gen6_set_rps(struct drm_device *dev, u8 val);
-extern void intel_detect_pch (struct drm_device *dev);
+extern void intel_detect_pch(struct drm_device *dev);
-extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
+extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);
+extern void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv);
+extern void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv);
+extern void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv);
+extern void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv);
 /* overlay */
 #ifdef CONFIG_DEBUG_FS
 extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev);
 	(((dev_priv)->info->gen >= 6) && \
 	((reg) < 0x40000) && \
 	((reg) != FORCEWAKE))
 #define __i915_read(x, y) \
-static inline u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \
-	u##x val = 0; \
-	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
-		gen6_gt_force_wake_get(dev_priv); \
-		val = read##y(dev_priv->regs + reg); \
-		gen6_gt_force_wake_put(dev_priv); \
-	} else { \
-		val = read##y(dev_priv->regs + reg); \
-	} \
-/*   trace_i915_reg_rw(false, reg, val, sizeof(val)); */\
-	return val; \
 	u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg);
 __i915_read(8, b)
 __i915_read(16, w)
 __i915_read(32, l)
 __i915_read(64, q)
 #undef __i915_read
-#define __i915_write(x, y) \
-static inline void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \
-/*   trace_i915_reg_rw(true, reg, val, sizeof(val));*/ \
-	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
-		__gen6_gt_wait_for_fifo(dev_priv); \
-	} \
+#define __i915_write(x, y) \
-	write##y(val, dev_priv->regs + reg); \
+	void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val);
 __i915_write(8, b)
 __i915_write(16, w)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_drv.h – Rev 2340 → 2342