1. 02 12月, 2011 40 次提交
    • T
      OMAPDSS: APPLY: add return value to dss_mgr_enable() · 2a4ee7ee
      Tomi Valkeinen 提交于
      Now that dss_mgr_enable() can fail due to checks, make it return the
      error value.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      2a4ee7ee
    • T
      OMAPDSS: APPLY: add checking of ovls/mgrs settings · 39518356
      Tomi Valkeinen 提交于
      Add checks for overlay and manager settings. The checks are a bit
      complex, as we need to observe the bigger picture instead of overlays
      and managers independently. Things like the used display and the zorder
      of other overlays affect the validity of the settings.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      39518356
    • T
      OMAPDSS: APPLY: add dss_mgr_simple_check() · f17d04fb
      Tomi Valkeinen 提交于
      Add dss_mgr_simple_check() which is used to check the validity of
      certain manager attributes. Only attributes that can be checked
      independently, without knowing the display being used, is done here
      (thus "simple").
      
      We can use this function in dss_mgr_set_info().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      f17d04fb
    • T
      OMAPDSS: APPLY: add dss_ovl_simple_check() · fcc764dc
      Tomi Valkeinen 提交于
      Add dss_ovl_simple_check() which is used to check the validity of
      certain overlay attributes. Only attributes that can be checked
      independently, without knowing the display being used, is done here
      (thus "simple").
      
      We can use this function in dss_ovl_set_info().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      fcc764dc
    • T
      OMAPDSS: APPLY: remove runtime_get · e70f98ac
      Tomi Valkeinen 提交于
      apply.c no longer touches any registers if an output is not enabled.
      This means that we don't need to do dispc_runtime_get() anymore, and the
      calls can be removed.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      e70f98ac
    • T
      OMAPDSS: APPLY: add wait_pending_extra_info_updates() · f1577ce1
      Tomi Valkeinen 提交于
      Add wait_pending_extra_info_updates() function which can be used to wait
      until any extra_info changes have been taken into use by the hardware.
      This can be only called when holding the apply mutex, so that other
      threads cannot insert new extra_info changes.
      
      This will be used to handle fifo-configurations.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      f1577ce1
    • T
      OMAPDSS: APPLY: skip enable/disable if already enabled/disabled · e4f7ad70
      Tomi Valkeinen 提交于
      Add checks to dss_mgr_enable, dss_mgr_disable, dss_ovl_enable,
      dss_ovl_disable that check if the state is already the same as given in
      the parameters, and exit if so.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      e4f7ad70
    • T
      OMAPDSS: APPLY: add dss_apply_ovl_enable() · 841c09c7
      Tomi Valkeinen 提交于
      Add a helper function dss_apply_ovl_enable(), which is similar to the
      main apply() function: dss_apply_ovl_enable() applies the given overlay
      enable-status to ovl_priv_data, and sets the dirty flag.
      
      The difference between the helper function and the previous direct use
      of the fields is that the helper function will not do anything if the
      enable state is already the same as given in the parameter.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      841c09c7
    • T
      OMAPDSS: APPLY: remove device_changed field · ff4733dc
      Tomi Valkeinen 提交于
      omap_overlay_manager contains device_changed field, which no longer has
      any use. So remove the field and the few places where it is touched.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      ff4733dc
    • T
      OMAPDSS: APPLY: rename dirty & shadow_dirty · 0b53f179
      Tomi Valkeinen 提交于
      Rename ovl_priv_data's and mgr_priv_data's dirty and shadow_dirty fields
      to info_dirty and shadow_info_dirty to better reflect what they mean.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      0b53f179
    • T
      OMAPDSS: APPLY: move fifo thresholds to extra_info set · 6dc802e2
      Tomi Valkeinen 提交于
      Setting overlay's fifo thresholds is currently handled at the same time
      as other overlay attributes. This is not right, as the normal attributes
      should only affect one overlay and manager, but changing the fifo
      thresholds are needed in cases like fifo-merge, where multiple managers
      are affected.
      
      This patch moves the channel field into the "extra_info" set, handled
      together with channel and enabled-status.
      
      This also lets us to calculate the fifos only when needed, specifically,
      when an overlay or a manager is enabled.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      6dc802e2
    • T
      OMAPDSS: APPLY: move channel-field to extra_info set · 5d5a97a6
      Tomi Valkeinen 提交于
      Setting overlay's output channel is currently handled at the same time
      as other overlay attributes. This is not right, as the normal attributes
      should only affect one overlay and manager, but changing the channel
      affects two managers.
      
      This patch moves the channel field into the "extra_info" set, handled
      together with enabled-status.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      5d5a97a6
    • T
      OMAPDSS: APPLY: move ovl->info to apply.c · c1a9febf
      Tomi Valkeinen 提交于
      struct omap_overlayr contains info and info_dirty fields, both of which
      should be internal to apply.c.
      
      This patch moves those fields into ovl_priv data, and names them
      user_info and user_info_dirty.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      c1a9febf
    • T
      OMAPDSS: APPLY: move mgr->info to apply.c · 388c4c6c
      Tomi Valkeinen 提交于
      struct omap_overlay_manager contains info and info_dirty fields, both of
      which should be internal to apply.c.
      
      This patch moves those fields into mgr_priv data, and names them
      user_info and user_info_dirty.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      388c4c6c
    • T
      OMAPDSS: APPLY: clean up isr_handler · 7609893c
      Tomi Valkeinen 提交于
      Add a helper function mgr_clear_shadow_dirty(), which clears the
      shadow_dirty flags for the given manager and for the overlays on that
      manager.
      
      This lets us simplify the code in the dss_apply_irq_handler().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      7609893c
    • T
      OMAPDSS: APPLY: add updating flag · 34861378
      Tomi Valkeinen 提交于
      Add "updating" flag to mgr_priv_data, which is used to track whether the
      manager is currently actively working, i.e. updating the screen.
      
      For auto-update displays updating is always true when the display is
      enabled, but for manual update displays the flag is true only during
      frame transfers.
      
      The flag is used to manage registers properly, for example when updating
      is false and a register for a manager is written, there's no need to set
      shadow_dirty flag nor set the GO bit, as the settings will be taken into
      use by the HW automatically when the output is enabled.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      34861378
    • T
      OMAPDSS: APPLY: rewrite register writing · 75c94965
      Tomi Valkeinen 提交于
      The functions writing to the DISPC registers in apply.c are more complex
      than needed. This patch cleans things up.
      
      Two helper functions are added: need_isr(), which returns if an isr for
      VSYNC is needed, and need_go(), which tells if there has been a write to
      the shadow registers and we need to set the GO bit.
      
      The functions that call the actual dispc write functions will set the
      dirty and shadow_dirty flags themselves, instead of that being done on
      the caller side. The writing functions also check if the dirty flag is
      even set, and return immediately if not.
      
      This allows us to clean up dss_write_regs().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      75c94965
    • T
      OMAPDSS: APPLY: rewrite overlay enable/disable · aaa874a9
      Tomi Valkeinen 提交于
      Overlays are currently enabled and disabled with a boolean in the struct
      omap_overlay_info. The overlay info is set with ovl->set_overlay_info(),
      and made into use with mgr->apply().
      
      This doesn't work properly, as the enable/disable status may affect also
      other overlays, for example when using fifo-merge. Thus the enabling and
      disabling of the overlay needs to be done outside the normal overlay
      configuration.
      
      This patch achieves that by doing the following things:
      
      1) Add function pointers to struct omap_overlay: enable(), disable() and
      is_enabled(). These are used to do the obvious. The functions may block.
      
      2) Move the "enabled" field from struct omap_overlay to ovl_priv_data.
      
      3) Add a new route for settings to be applied to the HW, called
      "extra_info". The status of the normal info and extra_info are tracked
      separately.
      
      The point here is to allow the normal info to be changed and
      applied in non-blocking matter, whereas the extra_info can only be
      changed when holding the mutex. This makes it possible to, for example,
      set the overlay enable flag, apply it, and wait until the HW has taken
      the flag into use.
      
      This is not possible if the enable flag would be in the normal info, as
      a new value for the flag could be set at any time from the users of
      omapdss.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      aaa874a9
    • T
      OMAPDSS: APPLY: add busy field to mgr_priv_data · 43a972d9
      Tomi Valkeinen 提交于
      Add a new field to mgr_priv data, "busy", which is used to track the
      status of GO bit with the manager. As manual update displays never use
      the GO bit, the field is always false for managers used for manual
      update displays.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      43a972d9
    • T
      OMAPDSS: APPLY: move mgr->enabled to mgr_priv_data · bf213523
      Tomi Valkeinen 提交于
      struct omap_overlay_manager contains "enabled"-field, used to track if
      the manager is enabled or not. This field should be internal to apply.c.
      
      This patch moves the field to mgr_priv_data, and applies the necessary
      locking when accessing the field.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      bf213523
    • T
      OMAPDSS: DSI: call mgr_enable/disable for cmd mode displays · 9a147a65
      Tomi Valkeinen 提交于
      The current code uses dsi_video_mode_enable/disable functions to
      enable/disable DISPC output for video mode displays. For command mode
      displays we have no notion in the DISPC side of whether the panel is
      enabled, except when a dss_mgr_start_update() call is made.
      
      However, to properly maintain the DISPC state in apply.c, we need to
      know if a manager used for a manual update display is currently in use.
      
      This patch achieves that by changing dsi_video_mode_enable/disable to
      dsi_enable/disable_video_output, which is called by both video and
      command mode displays. For video mode displays it starts the actual
      pixel stream, as it did before. For command mode displays it doesn't do
      anything else than mark that the manager is currently in use.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      9a147a65
    • T
      OMAPDSS: APPLY: add missing uses of spinlock · e0a2aa5b
      Tomi Valkeinen 提交于
      The functions in apply.c, called mostly via function pointers in overlay
      and overlay_manager structs, will be divided into two groups. The other
      group will not sleep and can be called from interrupts, and the other
      group may sleep.
      
      The idea is that the non-sleeping functions may only change certain
      settings in overlays and managers, and those settings may only affect
      the particular overlay/manager. For example, set the base address of the
      overlay.
      
      The blocking functions, however, will handle more complex configuration
      changes. For example, when an overlay is enabled and fifo-merge feature
      is used, we need to do the enable in multiple steps, waiting in between,
      and the change affects multiple overlays and managers.
      
      apply.c already contains a spinlock, which has been used to protect
      (badly) the dss_data. This patch adds locks/unlocks of the spinlock to
      the missing places, and the lock should now properly protect dss_data.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      e0a2aa5b
    • T
      OMAPDSS: APPLY: add mutex · 5558db3f
      Tomi Valkeinen 提交于
      The functions in apply.c, called mostly via function pointers in overlay
      and overlay_manager structs, will be divided into two groups. The first
      group will not sleep and can be called from interrupts, and the second
      group may sleep.
      
      The idea is that the non-sleeping functions may only change certain
      settings in overlays and managers, and those settings may only affect
      the particular overlay/manager. For example, set the base address of the
      overlay.
      
      The blocking functions, however, will handle more complex configuration
      changes. For example, when an overlay is enabled and fifo-merge feature
      is used, we need to do the enable in multiple steps, waiting in between,
      and the change affects multiple overlays and managers.
      
      This patch adds the mutex which is used in the blocking functions to
      have exclusive access to overlays and overlay managers.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      5558db3f
    • T
      OMAPDSS: remove ovl/mgr check-code temporarily · 5738b633
      Tomi Valkeinen 提交于
      DSS currently tries to check that the given overlay and overlay manager
      settings are acceptable, but the code does not work quite properly.
      Things may change between the check and the actual use of the settings.
      
      Furthermore, the following patches will rewrite how settings are
      configured and managed, and trying to keep the (broken) settings
      checking working during the rewrite would be very difficult.
      
      This patch removes the checking code, and a working version of checking
      will be added back after the settings rewrite has been done.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      5738b633
    • T
      OMAPDSS: APPLY: move mgr funcs to apply.c · eb70d739
      Tomi Valkeinen 提交于
      apply.c will handle the management of dispc in the future patches. This
      patch moves overlay manager related functions to apply.c so that they
      will have access to the private data and functions of apply.c.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      eb70d739
    • T
      OMAPDSS: APPLY: move ovl funcs to apply.c · f77b3070
      Tomi Valkeinen 提交于
      apply.c will handle the management of dispc in the future patches. This
      patch moves overlay related functions to apply.c so that they will have
      access to the private data and functions of apply.c.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      f77b3070
    • T
      OMAPDSS: APPLY: rename dss_cache to dss_data · d09c7aa8
      Tomi Valkeinen 提交于
      dss_cache struct contains private data used to manage dispc. "cache" is
      not a good word for it, so rename it to dss_data.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      d09c7aa8
    • T
      OMAPDSS: APPLY: move spinlock outside the struct · 063fd701
      Tomi Valkeinen 提交于
      dss_cache struct contains a spinlock used to protect the struct. A more
      logical place for the spinlock is outside the struct that it is
      protecting. So move it there.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      063fd701
    • T
      OMAPDSS: APPLY: rename manager_cache_data · af3d64b2
      Tomi Valkeinen 提交于
      manager_cache_data is not a suitable name for the struct. It is more of
      a private data for the manager.
      
      Rename the struct to mgr_priv_data, and add a function,
      get_mgr_priv(mgr), to get a pointer to the data.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      af3d64b2
    • T
      OMAPDSS: APPLY: rename overlay_cache_data · c10c6f04
      Tomi Valkeinen 提交于
      overlay_cache_data is not a suitable name for the struct. It is more of
      a private data for the overlay.
      
      Rename the struct to ovl_priv_data, and add a function,
      get_ovl_priv(ovl), to get a pointer to the data.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      c10c6f04
    • T
      OMAPDSS: APPLY: configure_* funcs take ovl/manager as args · f6a5e087
      Tomi Valkeinen 提交于
      Make configure_overlay() and configure_manager() take overlay/manager
      pointer as an argument, instead of the ovl/mgr id. This will be useful
      with the future patches.
      
      Also rename the functions to be a bit more informative:
      dss_ovl_write_regs, dss_mgr_write_regs, dss_write_regs.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      f6a5e087
    • T
      OMAPDSS: APPLY: use dispc_mgr_get_vsync_irq() · bc1a9518
      Tomi Valkeinen 提交于
      Use dispc_mgr_get_vsync_irq() to get the interrupt numbers for vsync,
      instead of hardcoding the values depending on the display type.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      bc1a9518
    • T
      OMAPDSS: APPLY: separate vsync isr register/unregister · dbce0160
      Tomi Valkeinen 提交于
      Create separate functions for the vsync isr register/unregister code for
      cleaner code.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      dbce0160
    • T
      OMAPDSS: store overlays in a list for each manager · 07e327c9
      Tomi Valkeinen 提交于
      Current way of handling overlay-manager links is a bit strange: each
      manager has a static array, containing pointers to all the overlays
      (even those used by other managers). The overlays contain a pointer to
      the manager being used.
      
      This patch makes the system a bit saner: each manager has a linked list
      of overlays, and only the overlays linked to that manager are in the
      list.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      07e327c9
    • T
      OMAPDSS: APPLY: cleanup dss_mgr_start_update · 6e53ca9d
      Tomi Valkeinen 提交于
      dss_mgr_start_update() has a loop, of which sole purpose is to find the
      manager used for this update. The whole loop is extra, as we already
      know the manager.
      
      Remove the loop.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      6e53ca9d
    • T
      OMAPDSS: APPLY: skip isr register and config for disabled displays · 04f6643a
      Tomi Valkeinen 提交于
      There's no need to register the vsync ISR and configure the hardware if
      the overlay manager is disabled, so this patch adds a check for disabled
      managers to the omap_dss_mgr_apply() function.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      04f6643a
    • T
      OMAPDSS: APPLY: skip isr register and config for manual update displays · 18135ead
      Tomi Valkeinen 提交于
      The mechanism to cache manager and overlay settings and configure them
      into the HW registers in VSYNC is meant only for auto-update displays,
      as it doesn't make sense (and doesn't work) for manual-update displays.
      
      This patchs adds a check so that we skip the above for manual update
      displays.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      18135ead
    • T
      OMAPDSS: APPLY: track whether a manager is enabled · be729178
      Tomi Valkeinen 提交于
      Add "enabled" field to struct omap_overlay_manager, which tells if the
      output is enabled or not. This will be used in apply.c in the following
      patches.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      be729178
    • T
      OMAPDSS: hide manager's enable/disable() · 7797c6da
      Tomi Valkeinen 提交于
      omap_overlay_manager struct contains enable() and disable() functions.
      However, these are only meant to be used from inside omapdss, and thus
      it's bad to expose the functions.
      
      This patch adds dss_mgr_enable() and dss_mgr_disable() functions to
      apply.c, which handle enabling and disabling the output.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      7797c6da
    • T
      OMAPDSS: create apply.c · 58f25548
      Tomi Valkeinen 提交于
      Create a new file, apply.c, and move code about handling the
      apply-mechanism and configuration of the managers and overlays from
      manager.c to apply.c.
      
      Not all related code is moved in this patch, but only the core
      apply/configure functions. The later patches move rest of the code from
      overlay.c and manager.c, adding necessary locking at the same time.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      58f25548