Merge branch 'gma500-fixes' of git://github.com/patjak/drm-gma500 into drm-next

Two fixes for gma500. First one from Anisse allows us to handle ASLE irqs even
when BIOS doesn't trigger a pipe event irq. The second one allows dual head
setups to have a big shared framebuffer.

* 'gma500-fixes' of git://github.com/patjak/drm-gma500:
  drm/gma500: Increase max resolution for mode setting
  drm/gma500: fix backlight hotkeys behaviour on netbooks

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 31ac392b84ea..1534e220097a 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -772,8 +772,8 @@ void psb_modeset_init(struct drm_device *dev)
         for (i = 0; i < dev_priv->num_pipe; i++)
                 psb_intel_crtc_init(dev, i, mode_dev);
 
-        dev->mode_config.max_width = 2048;
-        dev->mode_config.max_height = 2048;
+        dev->mode_config.max_width = 4096;
+        dev->mode_config.max_height = 4096;
 
         psb_setup_outputs(dev);
 
diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c
index 8652cdf3f03f..029eccf30137 100644
--- a/drivers/gpu/drm/gma500/psb_irq.c
+++ b/drivers/gpu/drm/gma500/psb_irq.c
@@ -211,7 +211,7 @@ irqreturn_t psb_irq_handler(DRM_IRQ_ARGS)
 
         vdc_stat = PSB_RVDC32(PSB_INT_IDENTITY_R);
 
-        if (vdc_stat & _PSB_PIPE_EVENT_FLAG)
+        if (vdc_stat & (_PSB_PIPE_EVENT_FLAG|_PSB_IRQ_ASLE))
                 dsp_int = 1;
 
         /* FIXME: Handle Medfield