[meego-commits] 24901: Changes to MeeGo:1.2.0:oss:Update:Testing/kernel-adaptation-pc
jbkonno
no_reply at build.meego.com
Fri Jun 8 16:52:54 UTC 2012
Hi,
I have made the following changes to kernel-adaptation-pc in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.
Thank You,
jbkonno
[This message was auto-generated]
---
Request #24901:
submit: devel:cdv/kernel-adaptation-pc(r5) -> MeeGo:1.2.0:oss:Update:Testing/kernel-adaptation-pc
Message:
* Mon Jun 04 2012 - Joe Konno <joe.konno at intel.com> - 3.0.0
- PowerVR driver, internal d2df26a2
- This represents version 1.0.1 of the core driver
- Driver enables Embedded Display Port and Display Port on Cedar Trail hardware
where these ports are present
* Mon May 14 2012 - Joe Konno <joe.konno at intel.com> - 3.0.0
- PowerVR driver, internal 37cc213f
- Messages about vblank counter are now drm.debug emits
- Fixes to Self-Refresh in DPMS corner cases
- Minor fixes to cases where driver is compiled as a module
- Removed 'no_fb' module parameter
State: new 2012-06-08T08:50:08 jbkonno
Comment: None
changes files:
--------------
--- kernel-adaptation-pc.changes
+++ kernel-adaptation-pc.changes
@@ -0,0 +1,13 @@
+* Mon Jun 04 2012 - Joe Konno <joe.konno at intel.com> - 3.0.0
+- PowerVR driver, internal d2df26a2
+- This represents version 1.0.1 of the core driver
+- Driver enables Embedded Display Port and Display Port on Cedar Trail hardware
+ where these ports are present
+
+* Mon May 14 2012 - Joe Konno <joe.konno at intel.com> - 3.0.0
+- PowerVR driver, internal 37cc213f
+- Messages about vblank counter are now drm.debug emits
+- Fixes to Self-Refresh in DPMS corner cases
+- Minor fixes to cases where driver is compiled as a module
+- Removed 'no_fb' module parameter
+
spec files:
-----------
other changes:
--------------
++++++ linux-3.0.0-cdv.patch.bz2
--- linux-3.0.0-cdv.patch.bz2
+++ linux-3.0.0-cdv.patch.bz2
@@ -81,10 +81,10 @@
+endif
diff --git a/drivers/staging/cdv/Makefile b/drivers/staging/cdv/Makefile
new file mode 100644
-index 0000000..3918e75
+index 0000000..682cd49
--- /dev/null
+++ b/drivers/staging/cdv/Makefile
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,200 @@
+# Makefile for the drm device driver. This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
@@ -256,6 +256,8 @@
+ $(DRMDRVDIR)/psb_umevents.o \
+ $(DRMDRVDIR)/psb_intel_crt.o \
+ $(DRMDRVDIR)/psb_intel_dpll_cdv.o \
++ $(DRMDRVDIR)/psb_intel_dp.o \
++ $(DRMDRVDIR)/psb_intel_panel.o
+
+cedarview_gfx-y += $(IMGVDIR)/psb_buffer.o \
+ $(IMGVDIR)/psb_fence.o \
@@ -1712,7 +1714,7 @@
+#endif
diff --git a/drivers/staging/cdv/drv/psb_bl.c b/drivers/staging/cdv/drv/psb_bl.c
new file mode 100644
-index 0000000..2ffbcd3
+index 0000000..e2f548f
--- /dev/null
+++ b/drivers/staging/cdv/drv/psb_bl.c
@@ -0,0 +1,135 @@
@@ -1779,7 +1781,7 @@
+ if (level > bd->props.max_brightness)
+ level = bd->props.max_brightness;
+
-+ psb_intel_lvds_set_backlight(dev, level);
++ psb_intel_panel_set_backlight(dev, level);
+
+ return 0;
+}
@@ -1789,7 +1791,7 @@
+ struct drm_device *dev = (struct drm_device *)bl_get_data(psb_backlight_device);
+
+ /* return locally cached var instead of HW read (due to DPST etc.) */
-+ return psb_intel_lvds_get_backlight(dev);
++ return psb_intel_panel_get_backlight(dev);
+}
+
+struct backlight_ops psb_ops = {
@@ -1817,7 +1819,7 @@
+ struct backlight_properties props;
+
+ memset(&props, 0, sizeof(struct backlight_properties));
-+ props.max_brightness = psb_intel_lvds_get_max_backlight(dev);
++ props.max_brightness = psb_intel_panel_get_max_backlight(dev);
+ props.type = BACKLIGHT_RAW;
+
+ psb_backlight_device = backlight_device_register("psb-bl", NULL, (void *)dev, &psb_ops, &props);
@@ -1827,7 +1829,7 @@
+ if ((ret = device_backlight_init(dev)) != 0)
+ return ret;
+
-+ psb_backlight_device->props.brightness = psb_intel_lvds_get_backlight(dev);
++ psb_backlight_device->props.brightness = psb_intel_panel_get_backlight(dev);
+ psb_backlight_device->props.max_brightness = props.max_brightness;
+ backlight_update_status(psb_backlight_device);
+#endif
@@ -2817,10 +2819,10 @@
+#endif
diff --git a/drivers/staging/cdv/drv/psb_drv.c b/drivers/staging/cdv/drv/psb_drv.c
new file mode 100644
-index 0000000..64080c7
+index 0000000..3159169
--- /dev/null
+++ b/drivers/staging/cdv/drv/psb_drv.c
-@@ -0,0 +1,1900 @@
+@@ -0,0 +1,1896 @@
+/**************************************************************************
+ * Copyright (c) 2011, Intel Corporation.
+ * All Rights Reserved.
@@ -2873,7 +2875,6 @@
+
+int drm_psb_debug = 0;
+static int drm_psb_trap_pagefaults;
-+int drm_psb_no_fb;
+int drm_msvdx_pmpolicy = PSB_PMPOLICY_POWERDOWN;
+int drm_msvdx_delay = 250;
+int drm_psb_ospm = 1;
@@ -2882,13 +2883,11 @@
+static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+
+MODULE_PARM_DESC(debug, "Enable debug output");
-+MODULE_PARM_DESC(no_fb, "Disable FBdev");
+MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
+MODULE_PARM_DESC(ospm, "switch for ospm support");
+MODULE_PARM_DESC(msvdx_pmpolicy, "msvdx power management policy btw frames");
+
+module_param_named(debug, drm_psb_debug, int, 0600);
-+module_param_named(no_fb, drm_psb_no_fb, int, 0600);
+module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);
+module_param_named(msvdx_pmpolicy, drm_msvdx_pmpolicy, int, 0600);
+module_param_named(msvdx_command_delay, drm_msvdx_delay, int, 0600);
@@ -3462,7 +3461,6 @@
+
+ psb_intel_opregion_fini(dev);
+
-+ if (drm_psb_no_fb == 0)
+ psb_modeset_cleanup(dev);
+
+ if (dev_priv) {
@@ -3788,7 +3786,7 @@
+ psb_intel_opregion_init(dev);
+ acpi_video_register();
+
-+ if (drm_psb_no_fb == 0) {
++ {
+ psb_modeset_init(dev);
+ psb_fbdev_init(dev);
+ drm_kms_helper_poll_init(dev);
@@ -4723,10 +4721,10 @@
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/cdv/drv/psb_drv.h b/drivers/staging/cdv/drv/psb_drv.h
new file mode 100644
-index 0000000..4bc2849
+index 0000000..0d93bb0
--- /dev/null
+++ b/drivers/staging/cdv/drv/psb_drv.h
-@@ -0,0 +1,1207 @@
+@@ -0,0 +1,1237 @@
+/**************************************************************************
+ * Copyright (c) 2011, Intel Corporation.
+ * All Rights Reserved.
@@ -4752,6 +4750,7 @@
+#include <linux/version.h>
+
+#include <drm/drmP.h>
++#include <drm/drm_crtc.h>
+#include "sys_pvr_drm_export.h"
+#include "psb_drm.h"
+#include "psb_reg.h"
@@ -5507,6 +5506,26 @@
+ struct backlight_device *backlight;
+ int child_dev_num;
+ struct child_device_config *child_dev;
++
++ struct drm_connector *int_lvds_connector;
++ struct drm_connector *int_edp_connector;
++ int backlight_level; /* restore backlight to this value */
++ int backlight_enabled;
++
++ struct drm_property *broadcast_rgb_property;
++ struct drm_property *force_audio_property;
++ struct {
++ int rate;
++ int lanes;
++ int preemphasis;
++ int vswing;
++
++ bool initialized;
++ bool support;
++ int bpp;
++ struct edp_power_seq pps;
++ } edp;
++ uint8_t panel_type;
+};
+
+struct psb_fpriv {
@@ -5737,11 +5756,6 @@
+int psb_get_brightness(struct backlight_device *bd);
+struct backlight_device * psb_get_backlight_device(void);
+
-+extern void psb_intel_lvds_set_backlight(struct drm_device *dev, int level);
-+/* psb_intel_lvds.c */
-+extern u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev);
-+extern u32 psb_intel_lvds_get_backlight(struct drm_device *dev);
-+
+/*
+ *Debug print bits setting
+ */
@@ -5766,7 +5780,6 @@
+#endif
+
+extern int drm_psb_debug;
-+extern int drm_psb_no_fb;
+extern int drm_psb_disable_vsync;
+extern int drm_idle_check_interval;
+
@@ -5933,13 +5946,28 @@
+
+extern int drm_psb_ospm;
+
++#define _wait_for(COND, MS, W) ({ \
++ unsigned long timeout__ = jiffies + msecs_to_jiffies(MS); \
++ int ret__ = 0; \
++ while (! (COND)) { \
++ if (time_after(jiffies, timeout__)) { \
++ ret__ = -ETIMEDOUT; \
++ break; \
(4054 more lines skipped)
More information about the MeeGo-commits
mailing list